Mercurial > emacs
changeset 90729:6588c6259dfb
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 545-562)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- erc-iswitchb: Temporarily enable iswitchb mode
* gnus--rel--5.10 (patch 172-176)
- Merge from emacs--devo--0
- Update from CVS
- Update from CVS: lisp/legacy-gnus-agent.el: Add Copyright notice.
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-156
line wrap: on
line diff
--- a/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,21 @@ +2006-12-10 Andreas Schwab <schwab@suse.de> + + * configure.in: Remove check for struct timezone, its result is + never used. + + * configure: Regenerate. + +2006-12-08 NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (tiny change) + + * configure.in: Add support for Solaris 10 on x86-64. + + * configure: Regenerate. + +2006-12-08 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> + + * INSTALL (DETAILED BUILDING AND INSTALLATION): Document usage + of PKG_CONFIG_PATH. + 2006-12-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * configure.in (HAVE_SYNC): New test. @@ -666,7 +684,7 @@ * make-dist (lispref): Do include lispref/index.texi. -2004-01-06 Eric Hanchrow <offby1@blarg.net> (tiny change) +2004-01-06 Eric Hanchrow <offby1@blarg.net> (tiny change) * make-dist (tempdir): Include cursors in nt/icons. @@ -1913,7 +1931,7 @@ 2000-06-02 Dave Love <fx@gnu.org> - * Makefile.in: (install-arch-indep): Add pcl-cvs to list of info + * Makefile.in (install-arch-indep): Add pcl-cvs to list of info files. * configure.in: Don't specify -n32 flag for mips-sgi-irix6.5. @@ -2073,7 +2091,7 @@ 1999-12-04 Dave Love <fx@gnu.org> - * Makefile.in: (install-arch-indep): Depend on `info'. + * Makefile.in (install-arch-indep): Depend on `info'. (install-strip): Use `install' as sub-make target. 1999-11-23 Ken Raeburn <raeburn@gnu.org>
--- a/INSTALL Fri Dec 15 01:34:17 2006 +0000 +++ b/INSTALL Sat Dec 16 01:29:26 2006 +0000 @@ -383,6 +383,16 @@ switch to the compiler, and link against libfoo.a and libbar.a libraries in addition to the standard ones. +For some libraries, like Gtk+, fontconfig and ALSA, `configure' use +pkg-config to find where those libraries are installed. +If you wan't pkg-config to look in special directories, you have to set +the environment variable PKG_CONFIG_PATH to point to the directories +where the .pc-files for those libraries are. +For example: + + PKG_CONFIG_PATH='/usr/local/alsa/lib/pkgconfig:/opt/gtk+-2.8/lib/pkgconfig' \ + ./configure + The work of `configure' can be done by editing various files in the distribution, but using `configure' is easier. See the section called "CONFIGURATION BY HAND" below if you want to do the configuration
--- a/admin/FOR-RELEASE Fri Dec 15 01:34:17 2006 +0000 +++ b/admin/FOR-RELEASE Sat Dec 16 01:29:26 2006 +0000 @@ -53,11 +53,16 @@ ** monnier@iro.umontreal.ca, Nov 24: gnus-summary-tick-article-forward doesn't work any more? -** christopher.ian.moore@gmail.com, Nov 30: too much recursion in gnus-sort-threads-1. +** Should CC mode set beginning-of-defun-function? + +** Need papers from Rubini for his code in t-mouse.el + Sent instructions. -** dooglus@gmail.com, Dec 1: Replacement of spaces in wdired +** jpff@cs.bath.ac.uk, Dec 7: Failure to submit second netnews message. -** Should CC mode set beginning-of-defun-function? +** kbd_buffer_store_event[_hold] called from outside signal handlers. + +** org.el change papers * DOCUMENTATION
--- a/configure Fri Dec 15 01:34:17 2006 +0000 +++ b/configure Sat Dec 16 01:29:26 2006 +0000 @@ -2456,6 +2456,7 @@ m68* ) machine=sun3 ;; i[3456]86-sun-sunos[34]* ) machine=sun386 ;; i[3456]86-*-* ) machine=intel386 ;; + amd64-*-*|x86_64-*-*) machine=amdx86-64 ;; powerpcle* ) machine=powerpcle ;; powerpc* | rs6000* ) machine=ibmrs6000 ;; sparc* ) machine=sparc ;; @@ -21653,300 +21654,6 @@ fi fi -# This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. -echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5 -echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6 -if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sys/types.h> -#include <$ac_cv_struct_tm> - - -int -main () -{ -static struct tm ac_aggr; -if (ac_aggr.tm_zone) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_member_struct_tm_tm_zone=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sys/types.h> -#include <$ac_cv_struct_tm> - - -int -main () -{ -static struct tm ac_aggr; -if (sizeof ac_aggr.tm_zone) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_member_struct_tm_tm_zone=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_member_struct_tm_tm_zone=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5 -echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6 -if test $ac_cv_member_struct_tm_tm_zone = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_STRUCT_TM_TM_ZONE 1 -_ACEOF - - -fi - -if test "$ac_cv_member_struct_tm_tm_zone" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_TM_ZONE 1 -_ACEOF - -else - echo "$as_me:$LINENO: checking for tzname" >&5 -echo $ECHO_N "checking for tzname... $ECHO_C" >&6 -if test "${ac_cv_var_tzname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <time.h> -#ifndef tzname /* For SGI. */ -extern char *tzname[]; /* RS6000 and others reject char **tzname. */ -#endif - -int -main () -{ -atoi(*tzname); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_var_tzname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_var_tzname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5 -echo "${ECHO_T}$ac_cv_var_tzname" >&6 - if test $ac_cv_var_tzname = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_TZNAME 1 -_ACEOF - - fi -fi - - -if test "$ac_cv_func_gettimeofday" = yes; then - echo "$as_me:$LINENO: checking for struct timezone" >&5 -echo $ECHO_N "checking for struct timezone... $ECHO_C" >&6 -if test "${emacs_cv_struct_timezone+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <sys/time.h> -int -main () -{ -struct timezone tz; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - if test "$cross_compiling" = yes; then - emacs_cv_struct_timezone=yes -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -main () { - struct timeval time; - struct timezone dummy; - exit (gettimeofday (&time, &dummy)); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - emacs_cv_struct_timezone=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -emacs_cv_struct_timezone=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -emacs_cv_struct_timezone=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $emacs_cv_struct_timezone" >&5 -echo "${ECHO_T}$emacs_cv_struct_timezone" >&6 -fi - ok_so_far=yes echo "$as_me:$LINENO: checking for socket" >&5 echo $ECHO_N "checking for socket... $ECHO_C" >&6
--- a/configure.in Fri Dec 15 01:34:17 2006 +0000 +++ b/configure.in Sat Dec 16 01:29:26 2006 +0000 @@ -960,6 +960,7 @@ m68* ) machine=sun3 ;; i[3456]86-sun-sunos[34]* ) machine=sun386 ;; i[3456]86-*-* ) machine=intel386 ;; + amd64-*-*|x86_64-*-*) machine=amdx86-64 ;; powerpcle* ) machine=powerpcle ;; powerpc* | rs6000* ) machine=ibmrs6000 ;; sparc* ) machine=sparc ;; @@ -2743,38 +2744,6 @@ fi fi -# This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. -AC_STRUCT_TIMEZONE - -dnl Note that AC_STRUCT_TIMEZONE doesn't do what you might expect. -if test "$ac_cv_func_gettimeofday" = yes; then - AC_CACHE_CHECK([for struct timezone], emacs_cv_struct_timezone, - [AC_TRY_COMPILE([#include <sys/time.h>], - [struct timezone tz;], - dnl It may be that we can't call gettimeofday with a non-null pointer, - dnl even though we have struct timezone (e.g. HPUX). In that case - dnl we'll lie about struct timezone. - [AC_TRY_RUN([ -#ifdef TIME_WITH_SYS_TIME -#include <sys/time.h> -#include <time.h> -#else -#ifdef HAVE_SYS_TIME_H -#include <sys/time.h> -#else -#include <time.h> -#endif -#endif -main () { - struct timeval time; - struct timezone dummy; - exit (gettimeofday (&time, &dummy)); -}], - emacs_cv_struct_timezone=yes, - emacs_cv_struct_timezone=no, emacs_cv_struct_timezone=yes)], - emacs_cv_struct_timezone=no)]) -fi - ok_so_far=yes AC_CHECK_FUNC(socket, , ok_so_far=no) if test $ok_so_far = yes; then
--- a/etc/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/etc/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,7 @@ +2006-12-08 Michael Olson <mwolson@gnu.org> + + * ERC-NEWS: Note that the list module has been removed. + 2006-12-05 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> * NEWS (Changes to cmuscheme): Mention the alternative for
--- a/etc/ERC-NEWS Fri Dec 15 01:34:17 2006 +0000 +++ b/etc/ERC-NEWS Sat Dec 16 01:29:26 2006 +0000 @@ -10,6 +10,11 @@ ** Changes and additions to modules +*** Channel lists (erc-list.el) + +**** This has been removed from Emacs 22, since a major contributor +to it has not yet assigned changes. + *** Channel tracking (erc-track.el) **** Use mouse-face and help-echo for channel names in the mode-line.
--- a/etc/NEWS Fri Dec 15 01:34:17 2006 +0000 +++ b/etc/NEWS Sat Dec 16 01:29:26 2006 +0000 @@ -1945,10 +1945,10 @@ or local keymaps. +++ -** The new kmacro package provides a simpler user interface to -emacs' keyboard macro facilities. - -Basically, it uses two function keys (default F3 and F4) like this: +** Emacs' keyboard macro facilities have been enhanced by the new +kmacro package. + +Keyboard macros are now defined and executed via the F3 and F4 keys: F3 starts a macro, F4 ends the macro, and pressing F4 again executes the last macro. While defining the macro, F3 inserts a counter value which automatically increments every time the macro is executed. @@ -1963,8 +1963,8 @@ C-x C-k C-a, and C-x C-k C-f. See the commentary in kmacro.el for more commands. -The normal macro bindings C-x (, C-x ), and C-x e now interfaces to -the keyboard macro ring. +The original macro bindings C-x (, C-x ), and C-x e are still +available, but they now interface to the keyboard macro ring too. The C-x e command now automatically terminates the current macro before calling it, if used while defining a macro.
--- a/etc/edt-user.doc Fri Dec 15 01:34:17 2006 +0000 +++ b/etc/edt-user.doc Sat Dec 16 01:29:26 2006 +0000 @@ -5,8 +5,8 @@ Copyright (C) 1986, 1992, 1994, 1995, 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -Author: Kevin Gallagher <kevingal@onramp.net> -Maintainer: Kevin Gallagher <kevingal@onramp.net> +Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> Keywords: emulations This file is part of GNU Emacs. @@ -928,7 +928,7 @@ G-HELP: Emacs Help | PAGE |Scroll Win|Open Line | DEL W | DO: Execute extended command | (7) | (8) | (9) | (-) | C-a: Beginning of Line |Ex Ext Cmd|Fill Parag|Elim Tabs | UND W | - C-b: Switch to Buffer +----------+----------+----------+----------+ + C-b: Backward Character +----------+----------+----------+----------+ C-d: Delete Character | ADVANCE | BACKUP | CUT/COPY | DEL C | C-e: End of Line | (4) | (5) | (6) | (,) | C-f: Forward Character | BOTTOM | TOP | Yank | UND C |
--- a/leim/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,15 @@ +2006-12-09 Juanma Barranquero <lekktu@gmail.com> + + * quail/latin-alt.el ("scandinavian-alt-postfix"): Fix typo. + + * quail/uni-input.el (ucs-input-help): Fix title of ucs input method. + +2006-12-09 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (leim-list.el): Depend on leim-ext.el as well. + Run Emacs to append non-empty non-comment lines in leim-ext.el + to leim-list.el. + 2006-12-05 Juanma Barranquero <lekktu@gmail.com> * makefile.w32-in (MISC): Add $(srcdir)/quail/sisheng.elc.
--- a/leim/Makefile.in Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/Makefile.in Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ # Makefile for leim subdirectory in GNU Emacs. # Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H14PRO021
--- a/leim/leim-ext.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/leim-ext.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,8 @@ -;; leim-ext.el -- extra leim configulation -*- coding:iso-2022-7bit; -*- +;; leim-ext.el -- extra leim configuration -*- coding:iso-2022-7bit; -*- ;; Copyright (C) 2004, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 2004, 2005 +;; Copyright (C) 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009
--- a/leim/makefile.w32-in Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/makefile.w32-in Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ # -*- Makefile -*- for leim subdirectory in GNU Emacs on the Microsoft W32 API. # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # National Institute of Advanced Industrial Science and Technology (AIST) # Registration Number H14PRO021 @@ -184,11 +184,12 @@ -f batch-byte-compile $(MISC_DIC:.elc=.el) # -# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as +# WARNING: Do NOT split the parts inside $(ARGQUOTE)s into multiple lines as # this can break with GNU Make 3.81 and later if sh.exe is used. -leim-list.el: $(SUBDIRS) $(WORLD) +leim-list.el: $(SUBDIRS) $(WORLD) $(srcdir)/leim-ext.el $(RUN_EMACS) -l $(buildlisppath)/international/quail \ --eval $(ARGQUOTE)(update-leim-list-file $(DQUOTE).$(DQUOTE))$(ARGQUOTE) + $(RUN_EMACS) --eval $(ARGQUOTE)(w32-append-code-lines $(DQUOTE)$@$(DQUOTE) $(DQUOTE)$(srcdir)/leim-ext.el$(DQUOTE))$(ARGQUOTE) install: all - mkdir "$(INSTALLDIR)"
--- a/leim/quail/cyril-jis.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/cyril-jis.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; cyril-jis.el --- Quail package for inputting JISX0208 Cyrillic letters ;; Copyright (C) 2001, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/cyrillic.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/cyrillic.el Sat Dec 16 01:29:26 2006 +0000 @@ -2,7 +2,7 @@ ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1997, 2003 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/ethiopic.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/ethiopic.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; ethiopic.el --- Quail package for inputting Ethiopic characters -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1997, 1998, 1999, 2001, 2006 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/greek.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/greek.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; greek.el --- Quail package for inputting Greek -*-coding: iso-2022-7bit-*- ;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997, 2001 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/hangul.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/hangul.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; hangul.el --- Quail package for inputting Korean Hangul characters -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 2002, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/hangul3.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/hangul3.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; hangul3.el --- Quail package for inputting Korean Hangul characters -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 1997, 1998, 2001, 2002, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997, 2002 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/hanja-jis.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/hanja-jis.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; hanja-jis.el --- Quail package for inputting Korean Hanja (JISX0208) -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1997 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/hanja.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/hanja.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; hanja.el --- Quail-package for Korean Hanja (KSC5601) -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 1997, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/hebrew.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/hebrew.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; hebrew.el --- Quail package for inputting Hebrew characters -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1999 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/ipa.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/ipa.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; ipa.el --- Quail package for inputting IPA characters -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1997 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/japanese.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/japanese.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; japanese.el --- Quail package for inputting Japanese -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 2001, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2005 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/lao.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/lao.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; lao.el --- Quail package for inputting Lao characters -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1997, 1999, 2004 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/latin-alt.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/latin-alt.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: utf-8;-*- ;; Copyright (C) 1997, 1998, 2001, 2002, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1999 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 @@ -1289,7 +1289,7 @@ (quail-define-package "scandinavian-alt-postfix" "Latin-1" "SC<" t "Scandinavian input method with postfix modifiers -Supported languages are Swidish, Norwegian, Danish, and Finnish. +Supported languages are Swedish, Norwegian, Danish, and Finnish. ae -> æ oe -> ø
--- a/leim/quail/latin-ltx.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/latin-ltx.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; latin-ltx.el --- Quail package for TeX-style input -*-coding: utf-8;-*- ;; Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -;; Copyright (C) 2001, 2005 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/latin-post.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/latin-post.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; latin-post.el --- Quail packages for inputting various European characters -*-coding: utf-8;-*- ;; Copyright (C) 1997, 1998, 2001, 2002, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1999 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/leim/quail/latin-pre.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/latin-pre.el Sat Dec 16 01:29:26 2006 +0000 @@ -2,7 +2,7 @@ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2000, 2005 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/lrt.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/lrt.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; lrt.el --- Quail package for inputting Lao characters by LRT method -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 1998, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1999 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/py-punct.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/py-punct.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; py-punct.el --- Quail packages for Chinese (pinyin + extra symbols) -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 2001, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997, 2000 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/pypunct-b5.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/pypunct-b5.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols) -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1997, 2000, 2003 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/symbol-ksc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/symbol-ksc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601) -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 1997, 2005, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/thai.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/thai.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; thai.el --- Quail package for inputting Thai characters -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1995, 1997, 1999, 2005 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/tibetan.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/tibetan.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; tibetan.el --- Quail package for inputting Tibetan characters -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 1997, 2006 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2000 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/leim/quail/uni-input.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/uni-input.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; uni-input.el --- Hex Unicode input method ;; Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc. -;; Copyright (C) 2004 +;; Copyright (C) 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 @@ -118,7 +118,7 @@ (interactive) (with-output-to-temp-buffer "*Help*" (princ "\ -Input method: ucs (mode line indicator:U) +Input method: ucs (mode line indicator:U+) Input as Unicode: U<hex> or u<hex>, where <hex> is a four-digit hex number.")))
--- a/leim/quail/viqr.el Fri Dec 15 01:34:17 2006 +0000 +++ b/leim/quail/viqr.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; viqr.el --- Quail packages for inputting Vietnamese with VIQR system -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1997 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lib-src/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/lib-src/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,10 @@ +2006-12-15 Juanma Barranquero <lekktu@gmail.com> + + * emacsclient.c (w32_execvp): New function; wrapper for `execvp'. + (execvp) [WINDOWSNT]: Redefine to `w32_execvp'. + (fail): Remove Windows-specific fix (subsumed into w32_execvp). + Suggestions and comment by Eli Zaretskii. + 2006-12-06 Christoph Conrad <christoph.conrad@gmx.de> * makefile.w32-in ($(BLD)/emacsclient.exe, $(BLD)/emacsclientw.exe): @@ -19,11 +26,11 @@ (set_tcp_socket): Make the message for non-local connections informational rather than an error. -2006-11-28 Kevin Ryde <user42@zip.com.au> (tiny change) +2006-11-28 Kevin Ryde <user42@zip.com.au> (tiny change) * etags.c (readline): Check for double quote after #line. -2006-11-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> (tiny change) +2006-11-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> * etags.c (readline): sscanf could in principle return 2. @@ -55,8 +62,8 @@ 2006-11-24 Michael Mauger <mmaug@yahoo.com> - * emacsclient.c (file_name_absolute_p) [WINDOWSNT]: Support - absolute file names with forward slashes. + * emacsclient.c (file_name_absolute_p) [WINDOWSNT]: Support absolute + file names with forward slashes. 2006-11-23 Juanma Barranquero <lekktu@gmail.com>
--- a/lib-src/emacsclient.c Fri Dec 15 01:34:17 2006 +0000 +++ b/lib-src/emacsclient.c Sat Dec 16 01:29:26 2006 +0000 @@ -152,16 +152,15 @@ /* Message functions. */ #ifdef WINDOWSNT -/* I first tried to check for STDOUT. The check did not work, - I get a valid handle also in nonconsole apps. - Instead I test for console title, which seems to work. */ int -w32_window_app() +w32_window_app () { static int window_app = -1; char szTitle[MAX_PATH]; if (window_app < 0) + /* Checking for STDOUT does not work; it's a valid handle also in + nonconsole apps. Testing for the console title seems to work. */ window_app = (GetConsoleTitleA (szTitle, MAX_PATH) == 0); return window_app; @@ -298,6 +297,43 @@ } +#ifdef WINDOWSNT + +/* + execvp wrapper for Windows. Quotes arguments with embedded spaces. + + This is necessary due to the broken implementation of exec* routines in + the Microsoft libraries: they concatenate the arguments together without + quoting special characters, and pass the result to CreateProcess, with + predictably bad results. By contrast, Posix execvp passes the arguments + directly into the argv array of the child process. +*/ +int +w32_execvp (path, argv) + char *path; + char **argv; +{ + int i; + + /* Required to allow a .BAT script as alternate editor. */ + argv[0] = (char *) alternate_editor; + + for (i = 0; argv[i]; i++) + if (strchr (argv[i], ' ')) + { + char *quoted = alloca (strlen (argv[i]) + 3); + sprintf (quoted, "\"%s\"", argv[i]); + argv[i] = quoted; + } + + return execvp (path, argv); +} + +#undef execvp +#define execvp w32_execvp + +#endif /* WINDOWSNT */ + /* Try to run a different command, or --if no alternate editor is defined-- exit with an errorcode. @@ -310,9 +346,7 @@ if (alternate_editor) { int i = optind - 1; -#ifdef WINDOWSNT - argv[i] = (char *)alternate_editor; -#endif + execvp (alternate_editor, argv + i); message (TRUE, "%s: error executing alternate editor \"%s\"\n", progname, alternate_editor); @@ -463,7 +497,7 @@ } #ifdef WINDOWSNT -/* Wrapper to make WSACleanup a cdecl, as required by atexit(). */ +/* Wrapper to make WSACleanup a cdecl, as required by atexit. */ void __cdecl close_winsock () { @@ -858,7 +892,7 @@ /* Modern Windows restrict which processes can set the foreground window. emacsclient can allow Emacs to grab the focus by calling the function - AllowSetForegroundWindow(). Unfortunately, older Windows (W95, W98 + AllowSetForegroundWindow. Unfortunately, older Windows (W95, W98 and NT) lack this function, so we have to check its availability. */ if (emacs_pid)
--- a/lisp/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,181 @@ +2006-12-15 Richard Stallman <rms@gnu.org> + + * shell.el (shell): Doc fix. + +2006-12-15 Kevin Gallagher <Kevin.Gallagher@boeing.com> + + * emulation/edt.el (edt-xserver): + * emulation/edt-mapper.el (edt-xserver): Replace `/' with a `-', + to fix a problem on Cygwin. + + * emulation/edt.el + * emulation/edt-mapper.el + * emulation/edt-lk201.el + * emulation/edt-pc.el + * emulation/edt-vt100.el: Update maintainer's email address. + +2006-12-15 Simon Marshall <simon@gnu.org> + + * progmodes/cc-fonts.el (c-font-lock-declarations): Fix previous + change. + +2006-12-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * term/mac-win.el (mac-atsu-font-table): Remove defvar. + (mac-handle-font-selection): Use mac-atsu-font-face-attributes + instead of mac-atsu-font-table. + (fontset-default): Specify argument MAXIMUM in x-list-fonts calls. + +2006-12-14 Stephen Leake <stephen_leake@member.fsf.org> + + * align.el (align-match-tex-pattern): Fix a rare bug which + hanged Emacs. + +2006-12-14 Richard Stallman <rms@gnu.org> + + * startup.el (use-fancy-splash-screens-p): Use frame-height + instead of window-height. Pass frame to image-size. + +2006-12-13 Kenichi Handa <handa@m17n.org> + + * international/mule-cmds.el (set-locale-environment): + Set default-sendmail-coding-system too. + +2006-12-12 J.D. Smith <jdsmith@as.arizona.edu> + + * progmodes/idlw-help.el: Fix copyright notice. + +2006-12-12 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/syntax.el (syntax-ppss-toplevel-pos): New fun. + +2006-12-11 Juanma Barranquero <lekktu@gmail.com> + + * subr.el (unread-command-char): Reformat obsolescence info. + +2006-12-11 Richard Stallman <rms@gnu.org> + + * emacs-lisp/cl-macs.el (defstruct): Suppress warnings + about calls to cl-struct-setf-expander. + +2006-12-11 Juanma Barranquero <lekktu@gmail.com> + + * ediff-merg.el (ediff-show-clashes-only): Doc fix. + (ediff-combination-pattern): Fix typo in docstring. + + * textmodes/refer.el (refer-find-entry): Doc fix. + (refer-bib-files-regexp, refer-bib-directory, refer-bib-files) + (refer-cache-bib-files, refer-find-next-entry, refer-yank-key): + Fix tipos in docstrings. + + * progmodes/idlwave.el (idlwave-library-path): Fix typos in docstring. + +2006-12-10 Kim F. Storm <storm@cua.dk> + + * ido.el (ido-init-completion-maps): Remap backward-kill-word + instead of binding M-backspace. + +2006-12-10 Juanma Barranquero <lekktu@gmail.com> + + * replace.el (replace-match-data, replace-match-maybe-edit): + * calc/calc-aent.el (calc-eval-error): + * emulation/vi.el (vi-char-argument): + * progmodes/cc-langs.el (c-at-vsemi-p-fn) + (c-vsemi-status-unknown-p-fn): Doc fixes. + +2006-12-10 Chong Yidong <cyd@stupidchicken.com> + + * menu-bar.el (menu-bar-showhide-menu, menu-bar-tools-menu) + (menu-bar-help-menu): Tooltip fixes. Suggested by Francis Wright. + +2006-12-10 Masatake YAMATO <jet@gyve.org> + + * progmodes/ld-script.el (ld-script-keywords): Fix a typo. + +2006-12-09 Chong Yidong <cyd@stupidchicken.com> + + * mouse-sel.el (mouse-sel-mode): Register mouse-2 as a click type. + + * man.el (Man-xref-button-action): New function. If the + `Man-target-string' button property is a function, assume it + accepts a position argument. + (Man-abstract-xref-man-page): Use it. + (Man-default-man-entry): New optional arg POS. + + * wdired.el (wdired-preprocess-symlinks): Make the spaces after + symlink arrows read-only and non-rear-sticky. + +2006-12-09 Martin Rudalics <rudalics@gmx.at> + + * wdired.el (wdired-change-to-wdired-mode, wdired-finish-edit) + (wdired-search-and-rename): Simplify code. + (wdired-preprocess-files, wdired-preprocess-perms): Make + read-only property of preceding character rear-nonsticky to + avoid that it can be modified. Put old-name and old-link + properties on character preceding name and replace + put-text-property by add-text-properties. + (wdired-get-filename, wdired-get-previous-link): Get old-name + and old-link properties from character preceding name and + simplify code. + (wdired-preprocess-perms, wdired-set-bit, wdired-toggle-bit) + (wdired-perms-to-number): Make local-map property + rear-nonsticky to avoid that text following permissions may be + modified. Use add-text-properties instead of put-text-property + when changing a permission bit. + (wdired-change-to-dired-mode): Remove stickiness properties. + +2006-12-09 Juanma Barranquero <lekktu@gmail.com> + + * international/mule-cmds.el (register-input-method): Doc fix. + +2006-12-09 Masayuki Ataka <masayuki.ataka@gmail.com> (tiny change) + + * cmuscheme.el (scheme-start-file): Use `let*', not `let'. + +2006-12-09 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> + + * textmodes/flyspell.el (flyspell-hack-local-variables-hook): New. + Force buffer local defs evaluation on local variables loading. + (flyspell-mode-on, flyspell-mode-off): Use it in + `hack-local-variables-hook'. + +2006-12-09 Eli Zaretskii <eliz@gnu.org> + + * emacs-lisp/find-func.el (find-variable): Doc fix. + + * help-fns.el (variable-at-point): Doc fix. + + * w32-fns.el (w32-append-code-lines): New function. + +2006-12-09 Romain Francoise <romain@orebokech.com> + + * comint.el (comint-insert-input): Delete obsolete comment. + +2006-12-08 Kevin Rodgers <ihs_4664@yahoo.com> + + * files.el (insert-file-1): Compare file size to + large-file-warning-threshold and request confirmation when + warranted. + +2006-12-08 Stefan Monnier <monnier@iro.umontreal.ca> + + * net/browse-url.el (browse-url): Set DISPLAY to the one of the + current frame, in case we're connected to several displays. + +2006-12-08 Juanma Barranquero <lekktu@gmail.com> + + * frame.el (other-frame): Doc fix. + (set-frame-parameter): Fix typo in docstring. + +2006-12-07 Kim F. Storm <storm@cua.dk> + + * info.el (Info-index): Strip leading colon from topic. + +2006-12-07 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gud.el (gud-speedbar-buttons): Deal with references + to pointers. + 2006-12-05 J.D. Smith <jdsmith@as.arizona.edu> * progmodes/idlwave.el (idlwave-xml-create-class-method-lists): @@ -6,9 +184,10 @@ 2006-12-05 Kim F. Storm <storm@cua.dk> * emulation/cua-base.el (cua-paste-pop-rotate-temporarily): Doc fix. - (cua-paste-pop): Rework last change for cua-paste-pop-rotate-temporarily, - so first M-y and C-y works alike, pasting the head of the kill-ring, and - prefix arg C-u M-y inserts the text inserted by the last M-y command. + (cua-paste-pop): Rework last change for + cua-paste-pop-rotate-temporarily, so first M-y and C-y works alike, + pasting the head of the kill-ring, and prefix arg C-u M-y inserts the + text inserted by the last M-y command. 2006-12-05 Micha,Ak(Bl Cadilhac <michael.cadilhac@lrde.org> @@ -25,8 +204,7 @@ * progmodes/fortran.el (fortran-mode-abbrev-table) * progmodes/octave-mod.el (octave-abbrev-table) * progmodes/sql.el (sql-mode-abbrev-table): Define abbrevs even - if abbrev-table is non-nil (saved user abbrevs may have been - restored). + if abbrev-table is non-nil (saved user abbrevs may have been restored). * progmodes/vhdl-mode.el (vhdl-mode-abbrev-table-init): Do not clear abbrev table, else saved abbrevs will not be restored.
--- a/lisp/ChangeLog.1 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.1 Sat Dec 16 01:29:26 2006 +0000 @@ -3246,7 +3246,8 @@ Set current buffer variables from defaults in case user's init file has changed them. - Copyright (C) 1985, 1986 Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 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.
--- a/lisp/ChangeLog.10 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.10 Sat Dec 16 01:29:26 2006 +0000 @@ -294,7 +294,7 @@ properties completely. * progmodes/cc-fonts.el (c-cpp-matchers): Handle line - continuations in cpp expressions. Do not fontify symbols after + continuations in cpp expressions. Do not fontify symbols after #ifdef etc as variables since that isn't consistent with how the face is used elsewhere (i.e. only for the definition of the symbol). @@ -492,7 +492,7 @@ directives are now considered part of the keywords to make things easier. - * progmodes/cc-defs.el: (c-(up|down)-list-(forward|backward)): + * progmodes/cc-defs.el (c-(up|down)-list-(forward|backward)): Make the position optional and added docstrings. (c-go-(up|down)-list-(forward|backward)): Add variants of the @@ -742,7 +742,7 @@ (c-simple-skip-symbol-backward, c-syntactic-content) (c-remove-<>-paren-properties): New helper functions. - * progmodes/cc-defs.el: (c-clear-char-syntax) + * progmodes/cc-defs.el (c-clear-char-syntax) (c-mark-paren-open, c-mark-paren-close): New support functions to handle syntactic properties on C++ template arglist brackets. (c-put-type-face, c-put-reference-face): Helpers to put faces on @@ -1074,7 +1074,7 @@ (iswitchb-xemacs): Delete variable and use (featurep 'xemacs) and fboundp instead. (iswitchb-completions): Remove two redundant arguments and local - variables. (All above from Stefan Monnier). + variables. (All above from Stefan Monnier). 2003-06-20 Masatake YAMATO <jet@gyve.org> @@ -1182,7 +1182,7 @@ (gud-find-c-expr): Simplify. * progmodes/fortran.el (fortran-gud-syntax-table): Syntax table - for parsing Fortran expressions for gud-print. (Stefan Monnier) + for parsing Fortran expressions for gud-print. (Stefan Monnier) (fortran-mode): Add local variable gud-find-expr. * progmodes/cc-mode.el (c-mode): Add local variable gud-find-expr. @@ -1285,7 +1285,7 @@ * emacs-lisp/debug.el (debug): Fix call to message. -2003-06-16 Michael Mauger <mmaug@yahoo.com> (tiny change) +2003-06-16 Michael Mauger <mmaug@yahoo.com> (tiny change) * emulation/cua-base.el (cua-mode): Use explicit arg to turn off minor modes. @@ -2183,7 +2183,7 @@ when requested. (gud-menu-map): Add a toggle button to menubar for gdb-many-windows. (gdb-many-windows): Define explicitly as a function and a variable - (formerly as a minor mode). These need to be global so layout can + (formerly as a minor mode). These need to be global so layout can be reset from any buffer. (gdb-assembler-mode): Keep fringe outside margin as the overlay arrow is not used for assembler. @@ -2257,7 +2257,7 @@ * net/tramp-efs.el: New file. -2003-05-24 Michael Albinus <Michael.Albinus@alcatel.de> +2003-05-24 Michael Albinus <Michael.Albinus@alcatel.de> * net/tramp.el (tramp-handle-file-truename): `sym' shouldn't be quoted. @@ -2302,7 +2302,7 @@ (forms--mode-commands): Don't bind \t in the maps where we call forms--mode-commands1. -2003-05-23 Taro Kawagishi <tarok@acm.org> +2003-05-23 Taro Kawagishi <tarok@acm.org> * arc-mode.el (archive-lzh-summarize): Calculate correct total header size for LZH level 1 header. @@ -2396,7 +2396,7 @@ choices buffer. (ispell-show-choices): Directly select `choices-window'. (ispell-help): Use default buffer size for electric help. - (ispell-adjusted-window-height): Correct for xemacs detection. + (ispell-adjusted-window-height): Correct for XEmacs detection. (ispell-start-process): Don't double specify dictionary file name. (ispell-init-process): Set `ispell-library-path' each call. (ispell-change-dictionary): Now only completes valid dictionaries. @@ -3831,7 +3831,7 @@ 2003-04-13 Masatake YAMATO <jet@gyve.org> * bindings.el (toplevel): Don't change the face - of major-mode on the mode line. Setting the face on + of major-mode on the mode line. Setting the face on the mode line code is installed by my mistake in my last change. @@ -3876,7 +3876,7 @@ (describe-minor-mode-from-symbol): Renamed from (old) describe-minor-mode. Use describe-minor-mode-completion-table-for-symbol. - Don't use eval. Just use symbol-name. + Don't use eval. Just use symbol-name. (describe-minor-mode-from-indicator): Document is updated. Use `format-mode-line'. Use describe-minor-mode-from-symbol instead of describe-minor-mode. @@ -3933,7 +3933,7 @@ 2003-04-11 Masatake YAMATO <jet@gyve.org> * progmodes/etags.el (select-tags-table-mode-map): - Don't create new keymap. Instead copy from button-buffer-map. + Don't create new keymap. Instead copy from button-buffer-map. Bind push-button to `t' instead of binding select-tags-table-select directly (tags-select-tags-table): New button. @@ -4124,7 +4124,7 @@ the same order as that in the buffer list, (desktop-save): Put buffers in the order given in desktop file, regardless of what handlers do. - (desktop-file-version): New variable. Version number of desktop + (desktop-file-version): New variable. Version number of desktop file format. (desktop-create-buffer-form): Variable deleted. (desktop-save): New customizable variable. @@ -4134,7 +4134,7 @@ (desktop-file-name): New function to convert a filename to the format specified in `desktop-file-name-format'. (desktop-create-buffer): Parameters renamed to descriptive - systematic names. These parameters are visible to handlers. + systematic names. These parameters are visible to handlers. Renames: ver -> desktop-file-version mim -> desktop-buffer-minor-modes @@ -4157,7 +4157,7 @@ (desktop-change-dir): New function. (desktop-save-in-load-dir): New function. Save desktop in directory from which it was loaded. - (desktop-revert): New function. Revert to the last loaded desktop. + (desktop-revert): New function. Revert to the last loaded desktop. 2003-04-06 Masatake YAMATO <jet@gyve.org> @@ -5624,7 +5624,7 @@ Face markup of calendar and diary displays: Any entry line that ends with [foo:value] where foo is a face attribute (except :box :stipple) or with [face:blah] tags, will have these values applied - to the calendar and fancy diary displays. These attributes "stack" + to the calendar and fancy diary displays. These attributes "stack" on calendar displays. File-wide attributes can be defined as follows: the first line matching "^# [tag:value]" defines the value for that particular tag. All of the tags' regexps can be @@ -6260,7 +6260,7 @@ of unrecognized entries indicating syntax errors in ChangeLog files. (authors-coding-system): New variable. (authors-many-files): Update doc string. - (authors-aliases): Change format. Now one entry with multiple + (authors-aliases): Change format. Now one entry with multiple aliases per author. (authors-valid-file-names, authors-renamed-files-alist) (authors-renamed-files-regexps): New variables. @@ -6363,7 +6363,7 @@ 2003-01-25 Bill Wohler <wohler@newt.com> - * mh-e: Created directory. ChangeLog will appear in a week when we + * mh-e: Created directory. ChangeLog will appear in a week when we release version 7.2. * mail/mh-alias.el, mail/mh-comp.el, mail/mh-customize.el, mail/mh-e.el, @@ -6532,7 +6532,7 @@ * gud.el (gud-display-line): If the current file is newer than its buffer, offer to reread the file. - (gud-keep-buffer): New buffer local variable. Ensures offer to + (gud-keep-buffer): New buffer local variable. Ensures offer to reread file is made just once. 2003-01-20 Stefan Monnier <monnier@cs.yale.edu> @@ -6862,7 +6862,7 @@ 2003-01-11 Nick Roberts <nick@nick.uklinux.net> * gud.el (gud-kill-buffer-hook): Save gud-minor-mode type. - (gud-reset): New function. Reset environment at end of debugging. + (gud-reset): New function. Reset environment at end of debugging. (gud-sentinel): Call gud-reset or gdb-reset. (gud-menu-map, gud-tool-bar-map, gdb): Change gud-goto to gud-until. @@ -6870,7 +6870,7 @@ to find out if variable shuld be dereferenced. (gud-display1): Exit if there is `No symbol'. (gdb-expressions-mode-map): Correction to key-binding. - (gdb-reset): New function. Reset environment at end of debugging. + (gdb-reset): New function. Reset environment at end of debugging. (gdb-quit): Remove. 2003-01-10 Dave Love <fx@gnu.org> @@ -7159,7 +7159,7 @@ (gdb-mouse-goto-breakpoint, gdb-frames-select): New functions. (gdb-frames-mouse-select): Simplify. Make keybindings (gdb-goto-breakpoint, gdb-frames-select, etc) - consistent with other modes in emacs. + consistent with other modes in Emacs. (gdb-display-source-buffer): Return window of source buffer for (gud-display-line). @@ -7395,8 +7395,8 @@ 2002-12-21 Nick Roberts <nick@nick.uklinux.net> - * gdb-ui.el: Remove the concept of an instance. This means that - a lot of functions have been renamed. Accessors are prefixed with + * gdb-ui.el: Remove the concept of an instance. This means that + a lot of functions have been renamed. Accessors are prefixed with gdb-get, setters with gdb-set and the word instance has been removed from many function and variable names. (gdb-display-buffer): Protect source buffer as well @@ -7575,7 +7575,7 @@ 2002-12-13 Markus Rost <rost@math.ohio-state.edu> * emacs-lisp/easy-mmode.el (define-minor-mode): - Use `custom-current-group'. Pass all groups to the hook. + Use `custom-current-group'. Pass all groups to the hook. (easy-mmode-define-global-mode): Use `custom-current-group'. * international/mule-cmds.el (current-language-environment): @@ -7993,7 +7993,7 @@ 2002-11-30 Nick Roberts <nick@nick.uklinux.net> * gdb-ui.el (gdb-many-windows): Define as a minor mode. - (toggle-gdb-windows): Remove. (Patch from Stefan Monnier) + (toggle-gdb-windows): Remove. (Patch from Stefan Monnier) * tooltip.el (tooltip-gud-process-output): Handle annotations that are output with gdba in gdb-ui.el. @@ -8115,7 +8115,7 @@ * tooltip.el (tooltip-gud-print-command): Add server prefix to the print command for gdb to keep it out of the command history. - * gdb-ui.el: Major re-organisation. Simplify legacy gdba + * gdb-ui.el: Major re-organisation. Simplify legacy gdba code to allow only one gdb process. 2002-11-23 Markus Rost <rost@math.ohio-state.edu> @@ -8129,7 +8129,7 @@ 2002-11-21 Nick Roberts <nick@nick.uklinux.net> - * gdb-ui.el : General tidying. Patches from Stefan Monnier. + * gdb-ui.el : General tidying. Patches from Stefan Monnier. 2002-11-20 Simon Josefsson <jas@extundo.com> @@ -9372,11 +9372,11 @@ append slash only if result doesn't end in a slash already. (tramp-handle-file-truename): Restructure logic. If list of steps is nil, return "/" as the real name. - (tramp-completion-mode): Add "\\(" and "\\)". Otherwise, + (tramp-completion-mode): Add "\\(" and "\\)". Otherwise, `match-string' doesn't make sense. From Michael Albinus. - (tramp-host-with-port-regexp): New defcustom. Equal to previous + (tramp-host-with-port-regexp): New defcustom. Equal to previous `tramp-host-regexp'. From Michael Albinus. - (tramp-host-regexp): Taken off hashes in host names. Otherwise, + (tramp-host-regexp): Taken off hashes in host names. Otherwise, scanning files like .rhosts would take comments as host names. From Michael Albinus. (tramp-file-name-structure, tramp-multi-file-name-hop-structure): @@ -10009,7 +10009,7 @@ (occur-next, occur-prev): Use it. * progmodes/sh-script.el (sh-mark-init): Don't set `occur-buffer'. - (sh-mark-line): Likewise. Use 'occur-target and 'occur-match + (sh-mark-line): Likewise. Use 'occur-target and 'occur-match instead of 'occur and 'occur-point. * eshell/em-unix.el (eshell-occur-mode-mouse-goto) @@ -10096,7 +10096,7 @@ (tramp-parse-netrc, tramp-parse-netrc-group): New functions. (tramp-user-regexp): " \t" are not user regexp characters. (tramp-completion-handle-file-name-all-completions): - Remove Ange-FTP cmpletion. It has a bug not handling the "/ftp:" prefix + Remove Ange-FTP cmpletion. It has a bug not handling the "/ftp:" prefix completely, and it returns local completions as well. (tramp-completion-function-alist-ftp): New constant. (tramp-completion-function-alist): Add completion function for "ftp". @@ -10275,27 +10275,26 @@ 2002-09-07 Michael Albinus <Michael.Albinus@alcatel.de> * net/tramp.el (tramp-methods): Remove `tramp-completion-function' - entries. They are handled now by `tramp-completion-function-alist'. - (tramp-completion-function): Defvar removed. I've never used - it. Hmm. + entries. They are handled now by `tramp-completion-function-alist'. + (tramp-completion-function): Defvar removed. I've never used it. Hmm. (tramp-get-completion-function) (tramp-get-completion-rsh, tramp-get-completion-ssh) (tramp-get-completion-telnet, tramp-get-completion-su): Functions removed as well. Not necessary any longer due to extended customization means. - (tramp-completion-function-alist): New defcustom. Holds all + (tramp-completion-function-alist): New defcustom. Holds all FUNCTION FILE pairs used for user and host name completion relevant for METHOD. (tramp-completion-function-alist-rsh) (tramp-completion-function-alist-ssh) (tramp-completion-function-alist-telnet) (tramp-completion-function-alist-su): Defconst for initializing - `tramp-completion-function-alist'. Unfortunately, mainly UNIX-like - values are known for me until now. Needs to be completed for at + `tramp-completion-function-alist'. Unfortunately, mainly UNIX-like + values are known for me until now. Needs to be completed for at least VMS++ like operating systems. (tramp-set-completion-function) (tramp-get-completion-function): New functions for configuration - of `tramp-completion-function-alist'. The old definition of + of `tramp-completion-function-alist'. The old definition of `tramp-get-completion-function' has been discarded. (tramp-completion-handle-file-name-all-completions): Change function call for user/host completion according to definition @@ -10332,7 +10331,7 @@ (tramp-get-completion-user-host): Accept user names as they are if typed until "@". (tramp-completion-mode): Replace `last-input-char' by modern - `last-input-event'. Check for `event-modifiers'. + `last-input-event'. Check for `event-modifiers'. 2002-09-06 Kai Gro,A_(Bjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> @@ -10391,8 +10390,8 @@ (tramp-make-multi-tramp-file-format-unified) (tramp-make-multi-tramp-file-format-separate): Removed. (tramp-make-tramp-file-name): Allow partial tramp file - names. Generate tramp file format on-the-fly depending on - parameters. Apply atomar format strings resp expressions. + names. Generate tramp file format on-the-fly depending on + parameters. Apply atomar format strings resp expressions. (tramp-get-completion-methods) (tramp-get-completion-user-host): Apply `tramp-make-tramp-file-name'. (tramp-parse-hosts-group): Take all host names and IP addresses @@ -10444,7 +10443,7 @@ * net/tramp.el (tramp-get-completion-methods) (tramp-get-completion-rsh) - (tramp-get-completion-ssh): Add "[" for Xemacs. + (tramp-get-completion-ssh): Add "[" for XEmacs. (tramp-completion-file-name-regexp-separate): Expression adapted. (tramp-completion-file-name-handler-alist): Add handler for `file-name-directory' and `file-name-nondirectory'. @@ -10455,7 +10454,7 @@ (tramp-completion-handle-file-name-all-completions): Apply `tramp-completion-run-real-handler'. (tramp-parse-rhosts) - (tramp-parse-shosts): Use `with-temp-buffer'. `result$,1!=(B renamed to + (tramp-parse-shosts): Use `with-temp-buffer'. `result' renamed to `res' (otherwise side effects in XEmacs). 2002-08-24 Michael Albinus <Michael.Albinus@alcatel.de> @@ -10470,7 +10469,7 @@ (tramp-get-completion-ssh): Doc string tuned. (tramp-methods): Doc string and custom type extended for `tramp-completion-function'. - (tramp-completion-function): Variable added. Is it really used? + (tramp-completion-function): Variable added. Is it really used? Other variables like `tramp-completion-function' aren't used. (tramp-completion-file-name-handler-alist): Add handler for `file-name-completion'. @@ -10518,7 +10517,7 @@ * net/tramp.el (tramp-invoke-ange-ftp): `tramp-disable-ange-ftp' must be called again after activating `ange-ftp'. - (tramp-ange-ftp-file-name-p): Check for Xemacs. + (tramp-ange-ftp-file-name-p): Check for XEmacs. 2002-08-08 Michael Albinus <Michael.Albinus@alcatel.de> @@ -10528,7 +10527,7 @@ tramp-invoke-ange-ftp 'write-region. (tramp-handle-set-file-modes): Change order of FILENAME and MODE passing to tramp-invoke-ange-ftp 'set-file-modes. - (tramp-flatten-list): New function. Maybe this functionality does + (tramp-flatten-list): New function. Maybe this functionality does exist already elsewhere in the libraries. (tramp-invoke-ange-ftp): Apply `tramp-flatten-list' to parameter list in order to avoid nested lists, f.e. when invoked from @@ -10660,7 +10659,7 @@ 2002-09-18 Luc Teirlinck <teirllm@mail.auburn.edu> - * ielm.el: (*1, *2, *3): New variables. + * ielm.el (*1, *2, *3): New variables. (ielm-eval-input): Make temporary buffers current on entry and exit to the let bindings for *, ** and ***. (inferior-emacs-lisp-mode): Mention *1, *2 and *3 in the docstring. @@ -10961,7 +10960,7 @@ 2002-09-12 Simon Josefsson <jas@extundo.com> * mail/smtpmail.el (smtpmail-send-it): Don't use : in filenames - (for cygwin). Suggested by Andrew Senior <aws@watson.ibm.com>. + (for cygwin). Suggested by Andrew Senior <aws@watson.ibm.com>. Use expand-file-name. Also don't require time-stamp. 2002-09-11 Richard M. Stallman <rms@gnu.org> @@ -11259,7 +11258,7 @@ 2002-09-08 Kim F. Storm <storm@cua.dk> * kmacro.el (kmacro-end-and-call-macro): New command to end and - call keyboard macro in one step. Bind it to C-x e by default. + call keyboard macro in one step. Bind it to C-x e by default. (kmacro-call-macro): Use format-kbd-macro. (kmacro-step-edit-macro): New command to interactively step edit and execute last keyboard macro. @@ -11459,7 +11458,7 @@ From Michael Albinus <Michael.Albinus@alcatel.de>: * net/tramp.el (tramp-invoke-ange-ftp): - (tramp-ange-ftp-file-name-p): Check for Xemacs. + (tramp-ange-ftp-file-name-p): Check for XEmacs. (tramp-do-copy-or-rename-file): Don't pass KEEP-DATE to tramp-invoke-ange-ftp 'rename. (tramp-handle-write-region): Don't pass LOCKNAME and CONFIRM to @@ -12552,7 +12551,7 @@ * warnings.el (lwarn, warn, warning-levels): Doc fix. (warning-suppress-log-types): Fix typo. - (display-warning): Fix typo. Remove useless assignment to free variable + (display-warning): Fix typo. Remove useless assignment to free variable `group-string'. 2002-07-25 Markus Rost <rost@math.ohio-state.edu> @@ -13371,8 +13370,8 @@ * files.el (after-find-file): Don't check for read-only status of files just created (and not yet saved on disk). - * ido.el (ido-completion-help): Changed xemacs specific code to - avoid byte compiler warning in GNU emacs. + * ido.el (ido-completion-help): Changed XEmacs specific code to + avoid byte compiler warning in GNU Emacs. (ido-set-matches1): Use regexp-quote instead of identity. (ido-complete-space): New function. (ido-define-mode-map): Bind it to SPACE. @@ -13696,7 +13695,7 @@ * faces.el (describe-face): Capitalize "not documented" message. * help-fns.el (describe-variable): Likewise. - (describe-function-1): Likewise. Also, document the obsolescence + (describe-function-1): Likewise. Also, document the obsolescence of the function, if applicable. 2002-06-26 Juanma Barranquero <lektu@terra.es> @@ -14190,7 +14189,7 @@ (italic): Try underlining for displays that don't support real italics. * cus-edit.el (custom-display): Add support for `supports' predicate. * term/tty-colors.el (color-name-rgb-alist): Use 16-bit RGB values - instead of 8-bit, for consistency with the rest of emacs. + instead of 8-bit, for consistency with the rest of Emacs. (tty-color-canonicalize): Only copy COLOR if we need to change it. (tty-color-approximate): Scale values from `color-name-rgb-alist' appropriately. Return the whole color description, rather than @@ -14553,7 +14552,7 @@ 2002-05-24 Glenn Morris <gmorris@ast.cam.ac.uk> - * progmodes/f90.el: (f90-end-of-subprogram): Remove the final + * progmodes/f90.el (f90-end-of-subprogram): Remove the final `forward-line'. (f90-end-of-block, f90-beginning-of-block, f90-next-block-end) (f90-previous-block-start): New navigation commands. @@ -14587,7 +14586,7 @@ (apropos-calc-scores, apropos-score-str, apropos-score-doc) (apropos-score-symbol): New functions. (apropos-command, apropos, apropos-value, apropos-documentation): - Allow keywords in addition to regexp. Added scoring. + Allow keywords in addition to regexp. Added scoring. (apropos-documentation-check-doc-file) (apropos-documentation-check-elc-file): Added scoring. (apropos-print): Sort according to score. @@ -15271,7 +15270,7 @@ (mouse-wheel-scroll-screen): Remove. ([mouse-wheel], [C-mouse-wheel], [S-mouse-wheel]): Use mwheel-scroll. - * w32-vars.el: (mouse-wheel-scroll-amount): Remove. + * w32-vars.el (mouse-wheel-scroll-amount): Remove. 2002-05-04 Markus Rost <rost@math.ohio-state.edu> @@ -15964,7 +15963,7 @@ 2002-04-22 Martin Stjernholm <bug-cc-mode@gnu.org> - * progmodes/cc-mode.el: (c-define-abbrev-table): New function to + * progmodes/cc-mode.el (c-define-abbrev-table): New function to pass the SYSTEM-FLAG to `define-abbrev' in a way that works in emacsen that doesn't support it. @@ -16480,7 +16479,7 @@ and macros. (c-in-literal): No longer recognizes macros as literals by - default. An extra flag argument is required to do that. + default. An extra flag argument is required to do that. (c-macro-start, c-query-macro-start) (c-query-and-set-macro-start): Added a cache for the macro @@ -16848,9 +16847,9 @@ (scroll-all-beginning-of-buffer-all, scroll-all-end-of-buffer-all): New functions. - * files.el: (auto-mode-alist): .f95 files in f90-mode. - - * progmodes/fortran.el: (fortran-beginning-do): Make regexp match + * files.el (auto-mode-alist): .f95 files in f90-mode. + + * progmodes/fortran.el (fortran-beginning-do): Make regexp match a DO statement irrespective of numeric label. 2002-04-20 Glenn Morris <gmorris@ast.cam.ac.uk> @@ -16956,7 +16955,7 @@ 2002-04-16 Michael Kifer <kifer@cs.stonybrook.edu> - * viper-ex.el: Patch by Samuel Padgett. Copyright papers received. + * viper-ex.el: Patch by Samuel Padgett. Copyright papers received. (viper-ex-print-buf-name): New variable. (viper-ex-print-buf): New variable. (ex-token-alist): Invoke ex-print on ":print" Ex commands. @@ -17448,7 +17447,7 @@ 2002-04-02 Mike Williams <mdub@bigfoot.com> * textmodes/sgml-mode.el (sgml-close-tag): Rename from - sgml-insert-end-tag. Simplify by using sgml-lexical-context. + sgml-insert-end-tag. Simplify by using sgml-lexical-context. (sgml-get-context): Remove use of sgml-inside-tag-p. (sgml-inside-tag-p): Remove. (sgml-looking-back-at): Short-circuit at beg of buffer. @@ -17493,7 +17492,7 @@ * textmodes/xml-lite.el: Removed much redundant stuff. (xml-lite-parse-tag-backward): Simplify parsing by assuming we - always start within text. Make use of sgml-unclosed-tag-p. + always start within text. Make use of sgml-unclosed-tag-p. 2002-04-01 Ville Skytt,Ad(B <ville.skytta@xemacs.org> @@ -18368,7 +18367,7 @@ * ediff-init.el: Comments. - * ediff-hook.el: Got rid of autoloads. Not needed, since the hook + * ediff-hook.el: Got rid of autoloads. Not needed, since the hook is loaded. * ediff-mult.el (ediff-intersect-directories) @@ -18383,7 +18382,7 @@ * ediff-util.el (ediff-compute-custom-diffs-maybe): Buglet fix. (ediff-inferior-compare-regions): Use - ediff-clone-buffer-for-region-comparison. Better and simpler interface. + ediff-clone-buffer-for-region-comparison. Better and simpler interface. * ediff.el (ediff-directories-internal): Cleanup. (ediff-clone-buffer-for-region-comparison): Better interface. @@ -19140,7 +19139,7 @@ 2002-02-10 Michael Kifer <kifer@cs.stonybrook.edu> * viper-util.el (viper-read-key-sequence): Fix so it'll read - fast key sequences in emacs native mode + fast key sequences in Emacs native mode (viper-events-to-keys): Delete. * viper.el (describe-key, describe-key-briefly): Get rid of @@ -19705,7 +19704,7 @@ 2002-01-20 Colin Walters <walters@verbum.org> - * ibuffer.el: (toplevel) Require `ibuf-ext', which is now compiled + * ibuffer.el (toplevel): Require `ibuf-ext', which is now compiled with `byte-compile-dynamic'. (ibuffer-default-directory, toplevel): Doc files. @@ -20050,7 +20049,7 @@ * viper-init.el (viper-cond-compile-for-xemacs-or-emacs): new macro that replaces viper-emacs-p and viper-xemacs-p in many - cases. Used to reduce the number of warnings. + cases. Used to reduce the number of warnings. * viper-cmd.el: Use viper-cond-compile-for-xemacs-or-emacs. (viper-standard-value): Move here from viper.el. @@ -21766,7 +21765,7 @@ 2001-11-25 ShengHuo ZHU <zsh@cs.rochester.edu> - * mail/rmail.el (rmail-enable-mime-composing): New. A lightweight + * mail/rmail.el (rmail-enable-mime-composing): New. A lightweight version of rmail-enable-mime. (rmail-forward): Use it. @@ -22028,7 +22027,7 @@ * emacs-lisp/lisp.el (mark-sexp): Mark more if repeated. - * progmodes/cc-engine.el (c-parse-state): Typo. From Martin Stjernholm. + * progmodes/cc-engine.el (c-parse-state): Typo. From Martin Stjernholm. * mwheel.el (mouse-wheel-scroll-amount): Allow float values. (mouse-wheel-progessive-speed): New var. @@ -22600,7 +22599,7 @@ * calc/calc-macs.el (calc-record-compilation-date-macro): Return a simple `setq' form. - * calc/calc-ext.el: (toplevel): Require calc. + * calc/calc-ext.el (toplevel): Require calc. (calc-fancy-prefix-map): New. (calc-fancy-prefix): Use it. (calc-fancy-prefix-other-key): New. @@ -23233,7 +23232,7 @@ 2001-10-26 Jason Rumney <jasonr@gnu.org> - * w32-fns.el: (w32-charset-info-alist): Use ANSI for iso10646-1 + * w32-fns.el (w32-charset-info-alist): Use ANSI for iso10646-1 when UNICODE is not defined. 2001-10-26 Sam Steingold <sds@gnu.org> @@ -23547,7 +23546,8 @@ ;; 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.
--- a/lisp/ChangeLog.11 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.11 Sat Dec 16 01:29:26 2006 +0000 @@ -14336,7 +14336,7 @@ ;; coding: iso-2022-7bit ;; End: - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 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.
--- a/lisp/ChangeLog.2 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.2 Sat Dec 16 01:29:26 2006 +0000 @@ -3994,7 +3994,8 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc. + Copyright (C) 1986, 1987, 1988, 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.
--- a/lisp/ChangeLog.3 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.3 Sat Dec 16 01:29:26 2006 +0000 @@ -12615,7 +12615,8 @@ See ChangeLog.2 for earlier changes. - Copyright (C) 1989, 1993 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 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.
--- a/lisp/ChangeLog.4 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.4 Sat Dec 16 01:29:26 2006 +0000 @@ -8939,7 +8939,8 @@ See ChangeLog.3 for earlier changes. - Copyright (C) 1993, 1994 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 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.
--- a/lisp/ChangeLog.5 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.5 Sat Dec 16 01:29:26 2006 +0000 @@ -9261,7 +9261,8 @@ See ChangeLog.4 for earlier changes. - Copyright (C) 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 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.
--- a/lisp/ChangeLog.6 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.6 Sat Dec 16 01:29:26 2006 +0000 @@ -8021,7 +8021,8 @@ See ChangeLog.5 for earlier changes. - Copyright (C) 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 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.
--- a/lisp/ChangeLog.7 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.7 Sat Dec 16 01:29:26 2006 +0000 @@ -23139,7 +23139,8 @@ See ChangeLog.6 for earlier changes. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 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.
--- a/lisp/ChangeLog.8 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.8 Sat Dec 16 01:29:26 2006 +0000 @@ -10012,7 +10012,8 @@ See ChangeLog.7 for earlier changes. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 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.
--- a/lisp/ChangeLog.9 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ChangeLog.9 Sat Dec 16 01:29:26 2006 +0000 @@ -20695,7 +20695,8 @@ ;; coding: iso-2022-7bit ;; End: - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 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.
--- a/lisp/align.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/align.el Sat Dec 16 01:29:26 2006 +0000 @@ -3,7 +3,8 @@ ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: John Wiegley <johnw@gnu.org> +;; Author: John Wiegley <johnw@gnu.org> +;; Maintainer: FSF ;; Keywords: convenience languages lisp ;; This file is part of GNU Emacs. @@ -1074,7 +1075,7 @@ (eq (char-before pos) ?\\)) (setq count (1+ count) pos (1- pos))) (eq (mod count 2) 1)) - (goto-char (match-beginning 2)))) + (goto-char (match-beginning (if reverse 1 2))))) result)) (defun align-new-section-p (beg end separator)
--- a/lisp/calc/calc-aent.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/calc/calc-aent.el Sat Dec 16 01:29:26 2006 +0000 @@ -232,9 +232,9 @@ (defvar calc-eval-error nil "Determines how calc handles errors. -NIL means return a list containing the character position of error. +If nil, return a list containing the character position of error. STRING means return error message as string rather than list. -T means abort and give an error message.") +The value t means abort and give an error message.") (defun calc-eval-error (msg) (if calc-eval-error @@ -700,10 +700,10 @@ (math-read-token)))))) ((or (and (>= ch ?0) (<= ch ?9)) (and (eq ch '?\.) - (eq (string-match "\\.[0-9]" math-exp-str math-exp-pos) + (eq (string-match "\\.[0-9]" math-exp-str math-exp-pos) math-exp-pos)) (and (eq ch '?_) - (eq (string-match "_\\.?[0-9]" math-exp-str math-exp-pos) + (eq (string-match "_\\.?[0-9]" math-exp-str math-exp-pos) math-exp-pos) (or (eq math-exp-pos 0) (and (memq calc-language '(nil flat big unform @@ -713,7 +713,7 @@ (1- math-exp-pos)))))) (or (and (eq calc-language 'c) (string-match "0[xX][0-9a-fA-F]+" math-exp-str math-exp-pos)) - (string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*' *\\)?\\(0*\\([2-9]\\|1[0-4]\\)\\(#\\|\\^\\^\\)[0-9a-dA-D.]+[eE][-+_]?[0-9]+\\|0*\\([2-9]\\|[0-2][0-9]\\|3[0-6]\\)\\(#\\|\\^\\^\\)[0-9a-zA-Z:.]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?" + (string-match "_?\\([0-9]+.?0*@ *\\)?\\([0-9]+.?0*' *\\)?\\(0*\\([2-9]\\|1[0-4]\\)\\(#\\|\\^\\^\\)[0-9a-dA-D.]+[eE][-+_]?[0-9]+\\|0*\\([2-9]\\|[0-2][0-9]\\|3[0-6]\\)\\(#\\|\\^\\^\\)[0-9a-zA-Z:.]+\\|[0-9]+:[0-9:]+\\|[0-9.]+\\([eE][-+_]?[0-9]+\\)?\"?\\)?" math-exp-str math-exp-pos)) (setq math-exp-token 'number math-expr-data (math-match-substring math-exp-str 0) @@ -751,7 +751,7 @@ math-expr-data (math-match-substring math-exp-str 0) math-exp-pos (match-end 0))) ((and (eq ch ?\") - (string-match "\\(\"\\([^\"\\]\\|\\\\.\\)*\\)\\(\"\\|\\'\\)" + (string-match "\\(\"\\([^\"\\]\\|\\\\.\\)*\\)\\(\"\\|\\'\\)" math-exp-str math-exp-pos)) (if (eq calc-language 'eqn) (progn @@ -765,9 +765,9 @@ math-exp-pos (match-end 0)))) ((and (= ch ?\\) (eq calc-language 'tex) (< math-exp-pos (1- (length math-exp-str)))) - (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" + (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" math-exp-str math-exp-pos) - (string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)" + (string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)" math-exp-str math-exp-pos)) (setq math-exp-token 'symbol math-exp-pos (match-end 0) @@ -791,11 +791,11 @@ (aset math-exp-str right ?\]))))))) ((and (= ch ?\\) (eq calc-language 'latex) (< math-exp-pos (1- (length math-exp-str)))) - (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" + (or (string-match "\\\\hbox *{\\([a-zA-Z0-9]+\\)}" math-exp-str math-exp-pos) - (string-match "\\\\text *{\\([a-zA-Z0-9]+\\)}" + (string-match "\\\\text *{\\([a-zA-Z0-9]+\\)}" math-exp-str math-exp-pos) - (string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)" + (string-match "\\(\\\\\\([a-zA-Z]+\\|[^a-zA-Z]\\)\\)" math-exp-str math-exp-pos)) (setq math-exp-token 'symbol math-exp-pos (match-end 0) @@ -821,7 +821,7 @@ (string= envname "pmatrix")) (if (string-match (concat "\\\\end{" envname "}") math-exp-str math-exp-pos) - (setq math-exp-str + (setq math-exp-str (replace-match "]" t t math-exp-str)) (error "%s" (concat "No closing \\end{" envname "}")))))) ((and (eq (nth 1 code) 'mat) @@ -852,7 +852,7 @@ (setq math-exp-token 'punc math-expr-data (math-match-substring math-exp-str 0) math-exp-pos (match-end 0)) - (and (eq (string-match "\\\\dots\\." math-exp-str math-exp-pos) + (and (eq (string-match "\\\\dots\\." math-exp-str math-exp-pos) math-exp-pos) (setq math-exp-pos (match-end 0))) (if (memq (aref math-expr-data 0) '(?~ ?^))
--- a/lisp/cmuscheme.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/cmuscheme.el Sat Dec 16 01:29:26 2006 +0000 @@ -269,9 +269,9 @@ "Return the name of the start file corresponding to PROG. Search in the directories \"~\" and \"~/.emacs.d\", in this order. Return nil if no start file found." - (let ((progname (file-name-nondirectory prog)) - (start-file (concat "~/.emacs_" progname)) - (alt-start-file (concat "~/.emacs.d/init_" progname ".scm"))) + (let* ((progname (file-name-nondirectory prog)) + (start-file (concat "~/.emacs_" progname)) + (alt-start-file (concat "~/.emacs.d/init_" progname ".scm"))) (if (file-exists-p start-file) start-file (and (file-exists-p alt-start-file) alt-start-file))))
--- a/lisp/comint.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/comint.el Sat Dec 16 01:29:26 2006 +0000 @@ -804,8 +804,6 @@ (defun comint-insert-input (event) "In a Comint buffer, set the current input to the previous input at point." - ;; This doesn't use "e" because it is supposed to work - ;; for events without parameters. (interactive "e") (mouse-set-point event) (let ((pos (point)))
--- a/lisp/composite.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/composite.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; composite.el --- support character composition -;; Copyright (C) 1999, 2000 +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/ediff-merg.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ediff-merg.el Sat Dec 16 01:29:26 2006 +0000 @@ -62,7 +62,7 @@ '("<<<<<<< variant A" A ">>>>>>> variant B" B "####### Ancestor" Ancestor "======= end") "*Pattern to be used for combining difference regions in buffers A and B. The value must be a list of the form -(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) +\(STRING1 bufspec1 STRING2 bufspec2 STRING3 bufspec3 STRING4) where bufspec is the symbol A, B, or Ancestor. For instance, if the value is '(STRING1 A STRING2 Ancestor STRING3 B STRING4) then the combined text will look like this: @@ -82,7 +82,7 @@ (defcustom ediff-show-clashes-only nil "*If t, show only those diff regions where both buffers disagree with the ancestor. This means that regions that have status prefer-A or prefer-B will be -skipped over. nil means show all regions." +skipped over. A value of nil means show all regions." :type 'boolean :group 'ediff-merge )
--- a/lisp/emacs-lisp/advice.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/advice.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; advice.el --- an overloading mechanism for Emacs Lisp functions -;; Copyright (C) 1993, 1994, 2000, 2001, 2004, +;; Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
--- a/lisp/emacs-lisp/assoc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/assoc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; assoc.el --- insert/delete/sort functions on association lists -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
--- a/lisp/emacs-lisp/authors.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/authors.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2000, 2002, 2003, 2004, 2005, +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org>
--- a/lisp/emacs-lisp/byte-run.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/byte-run.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; byte-run.el --- byte-compiler support for inlining -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com>
--- a/lisp/emacs-lisp/cl-compat.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/cl-compat.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility) -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com>
--- a/lisp/emacs-lisp/cl-extra.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/cl-extra.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com>
--- a/lisp/emacs-lisp/cl-macs.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/cl-macs.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com> ;; Version: 2.02 @@ -2291,10 +2292,15 @@ (if (cadr (memq :read-only (cddr desc))) (list 'error (format "%s is a read-only slot" accessor)) - (list 'cl-struct-setf-expander 'cl-x - (list 'quote name) (list 'quote accessor) - (and pred-check (list 'quote pred-check)) - pos))) + ;; If cl is loaded only for compilation, + ;; the call to cl-struct-setf-expander would + ;; cause a warning because it may not be + ;; defined at run time. Suppress that warning. + (list 'with-no-warnings + (list 'cl-struct-setf-expander 'cl-x + (list 'quote name) (list 'quote accessor) + (and pred-check (list 'quote pred-check)) + pos)))) forms) (if print-auto (nconc print-func
--- a/lisp/emacs-lisp/cl-seq.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/cl-seq.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; cl-seq.el --- Common Lisp features, part 3 -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com>
--- a/lisp/emacs-lisp/cl-specs.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/cl-specs.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; cl-specs.el --- Edebug specs for cl.el -*- no-byte-compile: t -*- -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org> ;; Keywords: lisp, tools, maint
--- a/lisp/emacs-lisp/cl.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/cl.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; cl.el --- Common Lisp extensions for Emacs -*-byte-compile-dynamic: t;-*- -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dave Gillespie <daveg@synaptics.com>
--- a/lisp/emacs-lisp/crm.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/crm.el Sat Dec 16 01:29:26 2006 +0000 @@ -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, 2006 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Sen Nagata <sen@eccosys.com> ;; Keywords: completion, minibuffer, multiple elements
--- a/lisp/emacs-lisp/cust-print.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/cust-print.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; cust-print.el --- handles print-level and print-circle -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Daniel LaLiberte <liberte@holonexus.org>
--- a/lisp/emacs-lisp/derived.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/derived.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; derived.el --- allow inheritance of major modes ;; (formerly mode-clone.el) -;; Copyright (C) 1993, 1994, 1999, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: David Megginson (dmeggins@aix1.uottawa.ca)
--- a/lisp/emacs-lisp/easymenu.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/easymenu.el Sat Dec 16 01:29:26 2006 +0000 @@ -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, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Keywords: emulations ;; Author: Richard Stallman <rms@gnu.org>
--- a/lisp/emacs-lisp/eldoc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/eldoc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; eldoc.el --- show function arglist or variable docstring in echo area -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Noah Friedman <friedman@splode.com>
--- a/lisp/emacs-lisp/elint.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/elint.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; elint.el --- Lint Emacs Lisp -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Peter Liljenberg <petli@lysator.liu.se>
--- a/lisp/emacs-lisp/ewoc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/ewoc.el Sat Dec 16 01:29:26 2006 +0000 @@ -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, 2006 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Cederqvist <ceder@lysator.liu.se> ;; Inge Wallin <inge@lysator.liu.se>
--- a/lisp/emacs-lisp/find-func.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/find-func.el Sat Dec 16 01:29:26 2006 +0000 @@ -397,7 +397,7 @@ ;;;###autoload (defun find-variable (variable) - "Find the definition of the VARIABLE near point. + "Find the definition of the VARIABLE at or before point. Finds the library containing the definition of the variable near point (selected by `variable-at-point') in a buffer and
--- a/lisp/emacs-lisp/find-gc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/find-gc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; find-gc.el --- detect functions that call the garbage collector -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/emacs-lisp/float-sup.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/float-sup.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; float-sup.el --- define some constants useful for floating point numbers. -;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/emacs-lisp/generic.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/generic.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; generic.el --- defining simple major modes with comment and font-lock ;; -;; Copyright (C) 1997, 1999, 2002, 2003, 2004, +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Peter Breton <pbreton@cs.umb.edu>
--- a/lisp/emacs-lisp/gulp.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/gulp.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gulp.el --- ask for updates for Lisp packages -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Sam Shteingold <shteingd@math.ucla.edu>
--- a/lisp/emacs-lisp/helper.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/helper.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; helper.el --- utility help package supporting help in electric modes -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman
--- a/lisp/emacs-lisp/lisp.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/lisp.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; lisp.el --- Lisp editing commands for Emacs -;; Copyright (C) 1985, 1986, 1994, 2000, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1994, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/emacs-lisp/lmenu.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/lmenu.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; lmenu.el --- emulate Lucid's menubar support -;; Copyright (C) 1992, 1993, 1994, 1997, 2002, 2003, 2004, +;; Copyright (C) 1992, 1993, 1994, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Keywords: emulations obsolete
--- a/lisp/emacs-lisp/lselect.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/lselect.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; lselect.el --- Lucid interface to X Selections -;; Copyright (C) 1990, 1993, 2002, 2003, 2004, +;; Copyright (C) 1990, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/emacs-lisp/map-ynp.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/map-ynp.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; map-ynp.el --- general-purpose boolean question-asker -;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2002, 2003, +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Roland McGrath <roland@gnu.org>
--- a/lisp/emacs-lisp/regexp-opt.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/regexp-opt.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; regexp-opt.el --- generate efficient regexps to match strings -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, ;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Marshall <simon@gnu.org>
--- a/lisp/emacs-lisp/regi.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/regi.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; regi.el --- REGular expression Interpreting engine -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com>
--- a/lisp/emacs-lisp/ring.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/ring.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; ring.el --- handle rings of items -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/emacs-lisp/shadow.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/shadow.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; shadow.el --- locate Emacs Lisp file shadowings -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Terry Jones <terry@santafe.edu>
--- a/lisp/emacs-lisp/sregex.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/sregex.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; sregex.el --- symbolic regular expressions -;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Bob Glickstein <bobg+sregex@zanshin.com>
--- a/lisp/emacs-lisp/syntax.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/syntax.el Sat Dec 16 01:29:26 2006 +0000 @@ -52,6 +52,14 @@ (defsubst syntax-ppss-depth (ppss) (nth 0 ppss)) +(defun syntax-ppss-toplevel-pos (ppss) + "Return the last preceding position at toplevel. +\"At toplevel\" means that it is outside of any syntactic entity: +outside of any parentheses, or comments, or strings. +Returns nil iff PPSS itself corresponds to a toplevel position." + (or (car (nth 9 ppss)) + (nth 8 ppss))) + (defsubst syntax-ppss-context (ppss) (cond ((nth 3 ppss) 'string)
--- a/lisp/emacs-lisp/timer.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/timer.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; timer.el --- run a function with args at some time in future -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/emacs-lisp/tq.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/tq.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; tq.el --- utility to maintain a transaction queue -;; Copyright (C) 1985, 1986, 1987, 1992, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Scott Draves <spot@cs.cmu.edu>
--- a/lisp/emacs-lisp/trace.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emacs-lisp/trace.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; trace.el --- tracing facility for Emacs Lisp functions -;; Copyright (C) 1993, 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
--- a/lisp/emulation/crisp.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/crisp.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; crisp.el --- CRiSP/Brief Emacs emulator -;; Copyright (C) 1997, 1998, 1999, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM>
--- a/lisp/emulation/edt-lk201.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/edt-lk201.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,10 +1,10 @@ ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards -;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004, +;; Copyright (C) 1986, 1992, 1993, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: Kevin Gallagher <kevingal@onramp.net> -;; Maintainer: Kevin Gallagher <kevingal@onramp.net> +;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Keywords: emulations ;; This file is part of GNU Emacs.
--- a/lisp/emulation/edt-mapper.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/edt-mapper.el Sat Dec 16 01:29:26 2006 +0000 @@ -3,8 +3,8 @@ ;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: Kevin Gallagher <kevingal@onramp.net> -;; Maintainer: Kevin Gallagher <kevingal@onramp.net> +;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Keywords: emulations ;; This file is part of GNU Emacs. @@ -129,8 +129,12 @@ (defconst edt-xserver (if (eq edt-window-system 'x) (if edt-x-emacs-p - (replace-in-string (x-server-vendor) "[ _]" "-") - (subst-char-in-string ? ?- (x-server-vendor))) + ;; The Cygwin window manager has a `/' in its + ;; name, which breaks the generated file name of + ;; the custom key map file. Replace `/' with a + ;; `-' to work around that. + (replace-in-string (x-server-vendor) "[ /]" "-") + (subst-char-in-string ?/ ?- (subst-char-in-string ? ?- (x-server-vendor)))) nil) "Indicates X server vendor name, if applicable.")
--- a/lisp/emulation/edt-pc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/edt-pc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,10 +1,10 @@ ;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards -;; Copyright (C) 1986, 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1986, 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: Kevin Gallagher <kevingal@onramp.net> -;; Maintainer: Kevin Gallagher <kevingal@onramp.net> +;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Keywords: emulations ;; This file is part of GNU Emacs.
--- a/lisp/emulation/edt-vt100.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/edt-vt100.el Sat Dec 16 01:29:26 2006 +0000 @@ -3,8 +3,8 @@ ;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. -;; Author: Kevin Gallagher <kevingal@onramp.net> -;; Maintainer: Kevin Gallagher <kevingal@onramp.net> +;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Keywords: emulations ;; This file is part of GNU Emacs.
--- a/lisp/emulation/edt.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/edt.el Sat Dec 16 01:29:26 2006 +0000 @@ -3,8 +3,8 @@ ;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. -;; Author: Kevin Gallagher <kevingal@onramp.net> -;; Maintainer: Kevin Gallagher <kevingal@onramp.net> +;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com> +;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com> ;; Keywords: emulations ;; This file is part of GNU Emacs. @@ -339,8 +339,12 @@ (defconst edt-xserver (if (eq edt-window-system 'x) (if edt-x-emacs19-p - (replace-in-string (x-server-vendor) "[ _]" "-") - (subst-char-in-string ? ?- (x-server-vendor))) + ;; The Cygwin window manager has a `/' in its + ;; name, which breaks the generated file name of + ;; the custom key map file. Replace `/' with a + ;; `-' to work around that. + (replace-in-string (x-server-vendor) "[ /]" "-") + (subst-char-in-string ?/ ?- (subst-char-in-string ? ?- (x-server-vendor)))) nil) "Indicates X server vendor name, if applicable.")
--- a/lisp/emulation/pc-mode.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/pc-mode.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; pc-mode.el --- emulate certain key bindings used on PCs -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/emulation/tpu-edt.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/tpu-edt.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT -;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu>
--- a/lisp/emulation/tpu-extras.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/tpu-extras.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt -;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu>
--- a/lisp/emulation/tpu-mapper.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/tpu-mapper.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file -;; Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Rob Riepel <riepel@networking.stanford.edu>
--- a/lisp/emulation/vi.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/vi.el Sat Dec 16 01:29:26 2006 +0000 @@ -820,7 +820,7 @@ (defun vi-char-argument (arg) "Get following character (could be any CHAR) as part of the prefix argument. -Possible prefix-arg cases are NIL, INTEGER, (NIL . CHAR) or (INTEGER . CHAR)." +Possible prefix-arg cases are nil, INTEGER, (nil . CHAR) or (INTEGER . CHAR)." (interactive "P") (let ((char (read-char))) (cond ((null arg) (setq prefix-arg (cons nil char)))
--- a/lisp/emulation/vip.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/vip.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; vip.el --- a VI Package for GNU Emacs -;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masahiko Sato <ms@sail.stanford.edu> ;; Keywords: emulations
--- a/lisp/emulation/ws-mode.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/emulation/ws-mode.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs -;; Copyright (C) 1991, 2002, 2003, 2004, 2005, +;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de>
--- a/lisp/erc/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/erc/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,23 @@ +2006-12-13 Leo <sdl.web@gmail.com> + + * erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it + isn't active already, instead of leaving it on. + +2006-12-10 Juanma Barranquero <lekktu@gmail.com> + + * erc-ezbounce.el (erc-ezb-init-session-list): Doc fix. + +2006-12-08 Michael Olson <mwolson@gnu.org> + + * erc.el: Re-evaluate contributions from a contributor, and found + them under 15 lines of non-obvious code, so it is safe to remove + the copyright notice. + (erc-modules): Remove list module. + + * erc-list.el: Remove, since a contributor who has not completed + their assignment has contributed significantly more than 15 lines + of code to this file. + 2006-11-28 Juanma Barranquero <lekktu@gmail.com> * erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify. @@ -18,6 +38,11 @@ (erc-update-current-channel-member, erc-load-script): (erc-mode-line-away-status-format): Doc fixes. +2006-11-20 Andrea Russo <rastandy@inventati.org> + + * erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker' + before calling `erc-display-prompt'. + 2006-11-24 Juanma Barranquero <lekktu@gmail.com> * erc.el (erc-after-connect, erc-open-ssl-stream) @@ -86,6 +111,11 @@ `erc-show-my-nick' is non-nil. (erc-compute-server): Doc fix. +2006-10-01 John J Foerch <jjfoerch@earthlink.net> + + * erc-stamp.el (erc-insert-timestamp-right): Exclude the newline + from the erc-timestamp field. + 2006-09-11 Michael Olson <mwolson@gnu.org> * erc-nicklist.el (erc-nicklist-insert-contents): Add missing
--- a/lisp/erc/ChangeLog.01 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/erc/ChangeLog.01 Sat Dec 16 01:29:26 2006 +0000 @@ -1035,7 +1035,7 @@ * erc-speak.el 1.1, erc.el 1.1: New file. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 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.
--- a/lisp/erc/ChangeLog.02 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/erc/ChangeLog.02 Sat Dec 16 01:29:26 2006 +0000 @@ -2596,7 +2596,7 @@ See ChangeLog.01 for earlier changes. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 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.
--- a/lisp/erc/ChangeLog.03 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/erc/ChangeLog.03 Sat Dec 16 01:29:26 2006 +0000 @@ -2140,7 +2140,7 @@ See ChangeLog.02 for earlier changes. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 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.
--- a/lisp/erc/ChangeLog.04 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/erc/ChangeLog.04 Sat Dec 16 01:29:26 2006 +0000 @@ -2069,7 +2069,7 @@ See ChangeLog.03 for earlier changes. - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 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.
--- a/lisp/erc/ChangeLog.05 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/erc/ChangeLog.05 Sat Dec 16 01:29:26 2006 +0000 @@ -1217,7 +1217,7 @@ See ChangeLog.04 for earlier changes. - 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.
--- a/lisp/erc/erc-dcc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/erc/erc-dcc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1035,6 +1035,7 @@ (setq erc-dcc-entry-data entry) (setq erc-dcc-unprocessed-output "") (setq erc-insert-marker (set-marker (make-marker) (point-max))) + (setq erc-input-marker (make-marker)) (erc-display-prompt buffer (point-max)) (set-process-buffer proc buffer) (add-hook 'kill-buffer-hook 'erc-dcc-chat-buffer-killed nil t)
--- a/lisp/erc/erc-ezbounce.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/erc/erc-ezbounce.el Sat Dec 16 01:29:26 2006 +0000 @@ -126,7 +126,7 @@ ;;;###autoload (defun erc-ezb-init-session-list (message) - "Reset the EZBounce session list to NIL." + "Reset the EZBounce session list to nil." (setq erc-ezb-session-list nil) (setq erc-ezb-inside-session-listing t)) @@ -134,7 +134,7 @@ (defun erc-ezb-end-of-session-list (message) "Indicate the end of the EZBounce session listing." (setq erc-ezb-inside-session-listing nil)) - + ;;;###autoload (defun erc-ezb-add-session (message) "Add an EZBounce session to the session list." @@ -157,7 +157,7 @@ (read-from-minibuffer "IRC port: " (erc-port-to-string "6667"))))) (erc-server-send (format "CONN %s %s" server port))))) - + ;;;###autoload (defun erc-ezb-select-session () @@ -173,7 +173,7 @@ (defun erc-ezb-initialize () "Add EZBouncer convenience functions to ERC." (add-hook 'erc-server-NOTICE-functions 'erc-ezb-notice-autodetect)) - + (provide 'erc-ezbounce) ;; arch-tag: e972aa7b-a9f4-4d16-a489-074ec7a1002e
--- a/lisp/erc/erc-list.el Fri Dec 15 01:34:17 2006 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,415 +0,0 @@ -;;; erc-list.el --- Provide a faster channel listing mechanism - -;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -;; Copyright (C) 2004 Brian Palmer - -;; Author: Mario Lang <mlang@lexx.delysid.org> -;; Keywords: comm - -;; This file is part of GNU Emacs. - -;; GNU Emacs is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. - -;; GNU Emacs is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. - -;;; Commentary: - -;; This file provides a simple derived mode for viewing Channel lists. -;; It also serves as a demonstration of how the new server hook facility -;; can be used. - -;;; Code: - -(require 'erc) -(require 'erc-networks) -(require 'sort) -(unless (fboundp 'make-overlay) - (require 'overlay)) -(eval-when-compile (require 'cl)) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; User customizable variables. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(defgroup erc-list nil - "Display IRC channels in another window when using /LIST" - :group 'erc) - -(defcustom erc-chanlist-progress-message t - "*Show progress message while accumulating channel list." - :group 'erc-list - :type 'boolean) - -(defcustom erc-no-list-networks nil - "*A list of network names on which the /LIST command refuses to work." - :group 'erc-list - :type '(repeat string)) - -(defcustom erc-chanlist-frame-parameters nil - "*If nil, the channel list is displayed in a new window; if non-nil, -this variable holds the frame parameters used to make a frame to -display the channel list." - :group 'erc-list - :type 'list) - -(defcustom erc-chanlist-hide-modeline nil - "*If nil, the channel list buffer has a modeline, otherwise the modeline is hidden." - :group 'erc-list - :type 'boolean) - -(defface erc-chanlist-header-face '((t (:bold t))) - "Face used for the headers in erc's channel list." - :group 'erc-faces) - -(defface erc-chanlist-odd-line-face '((t (:inverse-video t))) - "Face used for the odd lines in erc's channel list." - :group 'erc-faces) - -(defface erc-chanlist-even-line-face '((t (:inverse-video nil))) - "Face used for the even lines in erc's channel list." - :group 'erc-faces) - -(defface erc-chanlist-highlight '((t (:foreground "red"))) - "Face used to highlight the current line in the channel list." - :group 'erc-faces) - -;; This should perhaps be a defface that inherits values from the highlight face -;; but xemacs does not support inheritance -(defcustom erc-chanlist-highlight-face 'erc-chanlist-highlight - "Face used for highlighting the current line in a list." - :type 'face - :group 'erc-faces) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; All variables below this line are for internal use only. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(defvar erc-chanlist-channel-line-regexp "^\\([#&\\*][^ \t\n]*\\)\\s-+[0-9]+" - "Regexp that matches a channel line in the channel list buffer.") - -(defvar erc-chanlist-buffer nil) -(make-variable-buffer-local 'erc-chanlist-buffer) - -(defvar erc-chanlist-last-time 0 - "A time value used to throttle the progress indicator.") - -(defvar erc-chanlist-frame nil - "The frame displaying the most recent channel list buffer.") - -(defvar erc-chanlist-sort-state 'channel - "The sort mode of the channel list buffer. Either 'channel or 'users.") -(make-variable-buffer-local 'erc-chanlist-sort-state) - -(defvar erc-chanlist-highlight-overlay nil - "The overlay used for erc chanlist highlighting") -(make-variable-buffer-local 'erc-chanlist-highlight-overlay) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Define erc-chanlist-mode. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -(defcustom erc-chanlist-mode-hook nil - "Hook run by erc-chanlist-mode." - :group 'erc-list - :type 'hook) - -(define-derived-mode erc-chanlist-mode fundamental-mode "ERC Channel List" - "Mode for viewing a channel list of a particular server. - -\\{erc-chanlist-mode-map}" - (local-set-key "\C-c\C-j" 'erc-join-channel) - (local-set-key "j" 'erc-chanlist-join-channel) - (local-set-key "n" 'next-line) - (local-set-key "p" 'previous-line) - (local-set-key "q" 'erc-chanlist-quit) - (local-set-key "s" 'erc-chanlist-toggle-sort-state) - (local-set-key "t" 'toggle-truncate-lines) - (setq erc-chanlist-sort-state 'channel) - (setq truncate-lines t) - (add-hook 'post-command-hook 'erc-chanlist-post-command-hook 'append 'local)) - -;; Define module: -;;;###autoload (autoload 'erc-list-mode "erc-list") -(define-erc-module list nil - "List channels nicely in a separate buffer." - ((defalias 'erc-cmd-LIST 'erc-list-channels)) - ((defalias 'erc-cmd-LIST 'erc-list-channels-simple))) - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Functions. -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;;;###autoload -(defun erc-list-channels (&rest channel) - "Display a buffer containing a list of channels on the current server. -Optional argument CHANNEL specifies a single channel to list (instead of every -available channel)." - (interactive - (remove "" (split-string - (read-from-minibuffer "List channels (RET for all): ") " "))) - (if (and (null channel) - (erc-member-ignore-case (erc-network-name) erc-no-list-networks)) - (erc-display-line "ERC is configured not to allow the /LIST command on this network!" - (current-buffer)) - (erc-display-line (erc-make-notice (concat "Listing channel" - (if channel - "." - "s. This may take a while.")))) - (erc-chanlist channel)) - t) - -(defun erc-list-channels-simple (&optional line) - "Send the LIST command to the current server with optional channels LINE." - (when (string-match "^\\s-*\\(.*\\)$" line) - (let ((channels (match-string 1 line))) - (erc-log (format "cmd: LIST: %s" channels)) - (erc-server-send - (if (string= channels "") - "LIST" - (concat "LIST :" channels)))) - t)) -(put 'erc-list-channels-simple 'do-not-parse-args t) - -;;;###autoload -(defun erc-chanlist (&optional channels) - "Show a channel listing of the current server in a special mode. -Please note that this function only works with IRC servers which conform -to RFC and send the LIST header (#321) at start of list transmission." - (interactive) - (with-current-buffer (erc-server-buffer) - (erc-once-with-server-event - 321 - '(progn - (add-hook 'erc-server-322-functions 'erc-chanlist-322 nil t) - - (erc-once-with-server-event - 323 - '(progn - (remove-hook 'erc-server-322-functions 'erc-chanlist-322 t) - (let ((buf erc-chanlist-buffer)) - (if (not (buffer-live-p buf)) - (error "`erc-chanlist-buffer' does not refer to a live buffer")) - - (set-buffer buf) - (buffer-disable-undo) - (let (buffer-read-only - (sort-fold-case t)) - (sort-lines nil (point-min) (point-max)) - (setq erc-chanlist-sort-state 'channel) - - (let ((sum (count-lines (point-min) (point-max)))) - (goto-char (point-min)) - (insert (substitute-command-keys - (concat "'\\[erc-chanlist-toggle-sort-state]' toggle sort mode.\n" - "'\\[erc-chanlist-quit]' kill this buffer.\n" - "'\\[toggle-truncate-lines]' toggle line truncation.\n" - "'\\[erc-chanlist-join-channel]' join the channel listed on the current line.\n\n"))) - (insert (format "%d channels (sorted by %s).\n\n" - sum (if (eq erc-chanlist-sort-state 'channel) - "channel name" - "number of users")))) - - (insert (format "%-25s%5s %s\n------------------------ ----- ----------------------------\n" - "Channel" - "Users" - "Topic")) - - ;; Display the channel list buffer. - (if erc-chanlist-frame-parameters - (progn - (if (or (null erc-chanlist-frame) - (not (frame-live-p erc-chanlist-frame))) - (setq erc-chanlist-frame - (make-frame `((name . ,(format "Channels on %s" - erc-session-server)) - ,@erc-chanlist-frame-parameters)))) - (select-frame erc-chanlist-frame) - (switch-to-buffer buf) - (erc-prettify-channel-list)) - (pop-to-buffer buf) - (erc-prettify-channel-list)))) - (goto-char (point-min)) - (search-forward-regexp "^------" nil t) - (forward-line 1) - (erc-chanlist-highlight-line) - (message "") - t)) - - (setq erc-chanlist-buffer (get-buffer-create - (format "*Channels on %s*" - (erc-response.sender parsed)))) - (with-current-buffer erc-chanlist-buffer - (setq buffer-read-only nil) - (erase-buffer) - (erc-chanlist-mode) - (setq erc-server-process proc) - (if erc-chanlist-hide-modeline - (setq mode-line-format nil)) - (setq buffer-read-only t)) - t)) - - ;; Now that we've setup our callbacks, pull the trigger. - (if (interactive-p) - (message "Collecting channel list for server %s" erc-session-server)) - (erc-server-send (if (null channels) - "LIST" - (concat "LIST " - (mapconcat #'identity channels ",")))))) - -(defun erc-chanlist-322 (proc parsed) - "Process an IRC 322 message. - -The message carries information about one channel for the LIST -command." - (multiple-value-bind (channel num-users) - (cdr (erc-response.command-args parsed)) - (let ((topic (erc-response.contents parsed))) - (with-current-buffer erc-chanlist-buffer - (save-excursion - (goto-char (point-max)) - (let (buffer-read-only) - (insert (format "%-26s%4s %s\n" (erc-controls-strip channel) - num-users - (erc-controls-strip topic)))) - - ;; Maybe display a progress indicator in the minibuffer. - (when (and erc-chanlist-progress-message - (> (erc-time-diff - erc-chanlist-last-time (erc-current-time)) - 3)) - (setq erc-chanlist-last-time (erc-current-time)) - (message "Accumulating channel list ... %c" - (aref [?/ ?| ?\\ ?- ?! ?O ?o] (random 7)))) - - ;; Return success to prevent other hook functions from being run. - t))))) - -(defun erc-chanlist-post-command-hook () - "Keep the current line highlighted." - (ignore-errors - (save-excursion - (beginning-of-line) - (if (looking-at erc-chanlist-channel-line-regexp) - (erc-chanlist-highlight-line) - (erc-chanlist-dehighlight-line))))) - -(defun erc-chanlist-highlight-line () - "Highlight the current line." - (unless erc-chanlist-highlight-overlay - (setq erc-chanlist-highlight-overlay - (make-overlay (point-min) (point-min))) - ;; Detach it from the buffer. - (delete-overlay erc-chanlist-highlight-overlay) - (overlay-put erc-chanlist-highlight-overlay - 'face erc-chanlist-highlight-face) - ;; Expressly put it at a higher priority than the text - ;; properties used for faces later on. Gnu emacs promises that - ;; right now overlays are higher priority than text properties, - ;; but why take chances? - (overlay-put erc-chanlist-highlight-overlay 'priority 1)) - (move-overlay erc-chanlist-highlight-overlay (point) (1+ (point-at-eol)))) - -(defun erc-chanlist-dehighlight-line () - "Remove the line highlighting." - (delete-overlay erc-chanlist-highlight-overlay)) - -(defun erc-prettify-channel-list () - "Make the channel list buffer look pretty. -When this function runs, the current buffer must be the channel -list buffer, or it does nothing." - (if (eq major-mode 'erc-chanlist-mode) - (save-excursion - (let ((inhibit-read-only t)) - (goto-char (point-min)) - (when (search-forward-regexp "^-------" nil t) - (add-text-properties - (point-min) (1+ (point-at-eol)) '(face erc-chanlist-header-face)) - (forward-line 1)) - - (while (not (eobp)) - (add-text-properties - (point) (1+ (point-at-eol)) '(face erc-chanlist-odd-line-face)) - (forward-line 1) - (unless (eobp) - (add-text-properties - (point) (1+ (point-at-eol)) '(face erc-chanlist-even-line-face))) - (forward-line 1)))))) - -(defun erc-chanlist-toggle-sort-state () - "Toggle the channel list buffer sorting method. -Either sort by channel names or by number of users in each channel." - (interactive) - (let ((inhibit-read-only t) - (sort-fold-case t)) - (save-excursion - (goto-char (point-min)) - (search-forward-regexp "^-----" nil t) - (forward-line 1) - (unless (eobp) - (if (eq erc-chanlist-sort-state 'channel) - (progn - (sort-numeric-fields 2 (point) (point-max)) - (reverse-region (point) (point-max)) - (setq erc-chanlist-sort-state 'users)) - (sort-lines nil (point) (point-max)) - (setq erc-chanlist-sort-state 'channel)) - - (goto-char (point-min)) - (if (search-forward-regexp "^[0-9]+ channels (sorted by \\(.*\\)).$" - nil t) - (replace-match (if (eq erc-chanlist-sort-state 'channel) - "channel name" - "number of users") - nil nil nil 1)) - - (goto-char (point-min)) - (search-forward-regexp "^-----" nil t) - (forward-line 1) - (recenter -1) - - (erc-prettify-channel-list))))) - -(defun erc-chanlist-quit () - "Quit Chanlist mode. -Kill the channel list buffer, window, and frame (if there's a frame -devoted to the channel list)." - (interactive) - (kill-buffer (current-buffer)) - (if (eq (selected-frame) erc-chanlist-frame) - (delete-frame) - (delete-window))) - -(defun erc-chanlist-join-channel () - "Join the channel listed on the current line of the channel list buffer. -Private channels, which are shown as asterisks (*), are ignored." - (interactive) - (save-excursion - (beginning-of-line) - (when (looking-at erc-chanlist-channel-line-regexp) - (let ((channel-name (match-string 1))) - (when (and (stringp channel-name) - (not (string= channel-name "*"))) - (run-at-time 0.5 nil 'erc-join-channel channel-name)))))) - -(provide 'erc-list) - -;;; erc-list.el ends here -;; -;; Local Variables: -;; indent-tabs-mode: t -;; tab-width: 8 -;; End: - -;; arch-tag: 4a13196a-a61b-465a-9926-044dfbc7e5ff
--- a/lisp/erc/erc-stamp.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/erc/erc-stamp.el Sat Dec 16 01:29:26 2006 +0000 @@ -266,8 +266,8 @@ (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) + (erc-put-text-property from (point) 'field 'erc-timestamp) + (erc-put-text-property from (point) 'rear-nonsticky t) (when erc-timestamp-intangible (erc-put-text-property from (1+ (point)) 'intangible t)))))
--- a/lisp/erc/erc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/erc/erc.el Sat Dec 16 01:29:26 2006 +0000 @@ -2,7 +2,6 @@ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. -;; Copyright (C) 2004 Brian Palmer ;; Author: Alexander L. Belikoff (alexander@belikoff.net) ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu), @@ -1669,22 +1668,25 @@ Due to some yet unresolved reason, global function `iswitchb-mode' needs to be active for this function to work." (interactive "P") - (eval-and-compile + (eval-when-compile (require 'iswitchb)) - (let ((iswitchb-make-buflist-hook - (lambda () - (setq iswitchb-temp-buflist - (mapcar 'buffer-name - (erc-buffer-list - nil - (when arg erc-server-process))))))) - (switch-to-buffer - (iswitchb-read-buffer - "Switch-to: " - (if (boundp 'erc-modified-channels-alist) - (buffer-name (caar (last erc-modified-channels-alist))) - nil) - t)))) + (let ((enabled iswitchb-mode)) + (or enabled (iswitchb-mode 1)) + (let ((iswitchb-make-buflist-hook + (lambda () + (setq iswitchb-temp-buflist + (mapcar 'buffer-name + (erc-buffer-list + nil + (when arg erc-server-process))))))) + (switch-to-buffer + (iswitchb-read-buffer + "Switch-to: " + (if (boundp 'erc-modified-channels-alist) + (buffer-name (caar (last erc-modified-channels-alist))) + nil) + t))) + (or enabled (iswitchb-mode -1)))) (defun erc-channel-list (proc) "Return a list of channel buffers. @@ -1761,7 +1763,7 @@ (defcustom erc-modules '(netsplit fill button match track completion readonly ring autojoin noncommands irccontrols - stamp list) + stamp) "A list of modules which ERC should enable. If you set the value of this without using `customize' remember to call \(erc-update-modules) after you change it. When using `customize', modules @@ -1792,7 +1794,6 @@ (const :tag "Launch an identd server on port 8113" identd) (const :tag "Highlight or remove IRC control characters" irccontrols) - (const :tag "List channels in a separate buffer" list) (const :tag "Save buffers in logs" log) (const :tag "Highlight pals, fools, and other keywords" match) (const :tag "Detect netsplits" netsplit)
--- a/lisp/eshell/em-alias.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-alias.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-alias.el --- creation and management of command aliases -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-banner.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-banner.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-banner.el --- sample module that displays a login banner -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-basic.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-basic.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-basic.el --- basic shell builtin commands -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-cmpl.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-cmpl.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-cmpl.el --- completion using the TAB key -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-dirs.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-dirs.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-dirs.el --- directory navigation commands -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-glob.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-glob.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-glob.el --- extended file name globbing -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-hist.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-hist.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-hist.el --- history list management -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-ls.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-ls.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-ls.el --- implementation of ls in Lisp -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-pred.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-pred.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-pred.el --- argument predicates and modifiers (ala zsh) -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-prompt.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-prompt.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-prompt.el --- command prompts -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-rebind.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-rebind.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-rebind.el --- rebind keys when point is at current input -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-script.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-script.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-script.el --- Eshell script files -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-smart.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-smart.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-smart.el --- smart display of output -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-term.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-term.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-term.el --- running visual commands -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/em-xtra.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/em-xtra.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; em-xtra.el --- extra alias functions -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/esh-arg.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/esh-arg.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; esh-arg.el --- argument processing -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/esh-cmd.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/esh-cmd.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; esh-cmd.el --- command invocation -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/esh-ext.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/esh-ext.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; esh-ext.el --- commands external to Eshell -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/esh-io.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/esh-io.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; esh-io.el --- I/O management -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/esh-maint.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/esh-maint.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; esh-maint.el --- init code for building eshell -*- no-byte-compile: t -*- -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/esh-opt.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/esh-opt.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; esh-opt.el --- command options processing -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/esh-proc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/esh-proc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; esh-proc.el --- process management -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/esh-test.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/esh-test.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; esh-test.el --- Eshell test suite -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/esh-var.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/esh-var.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; esh-var.el --- handling of variables -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/eshell/eshell.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/eshell/eshell.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; eshell.el --- the Emacs command shell -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@gnu.org>
--- a/lisp/files.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/files.el Sat Dec 16 01:29:26 2006 +0000 @@ -1695,6 +1695,16 @@ (if (file-directory-p filename) (signal 'file-error (list "Opening input file" "file is a directory" filename))) + ;; Check whether the file is uncommonly large (see find-file-noselect): + (let (size) + (when (and large-file-warning-threshold + (setq size (nth 7 (file-attributes filename))) + (> size large-file-warning-threshold) + (not (y-or-n-p + (format "File %s is large (%dMB), really insert? " + (file-name-nondirectory filename) + (/ size 1048576))))) + (error "Aborted"))) (let* ((buffer (find-buffer-visiting (abbreviate-file-name (file-truename filename)) #'buffer-modified-p)) (tem (funcall insert-func filename))) @@ -2916,7 +2926,7 @@ (interactive (list (if buffer-file-name (read-file-name "Write file: " - nil nil nil nil) + nil nil nil nil) (read-file-name "Write file: " default-directory (expand-file-name (file-name-nondirectory (buffer-name))
--- a/lisp/frame.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/frame.el Sat Dec 16 01:29:26 2006 +0000 @@ -705,7 +705,7 @@ (set-mouse-position (selected-frame) (1- (frame-width)) 0)))) (defun other-frame (arg) - "Select the ARG'th different visible frame on current display, and raise it. + "Select the ARGth different visible frame on current display, and raise it. All frames are arranged in a cyclic order. This command selects the frame ARG steps away in that order. A negative ARG moves in the opposite order. @@ -881,7 +881,7 @@ (defun set-frame-parameter (frame parameter value) "Set frame parameter PARAMETER to VALUE on FRAME. If FRAME is nil, it defaults to the selected frame. -See `modify-frame-parameters.'" +See `modify-frame-parameters'." (modify-frame-parameters frame (list (cons parameter value)))) (defun set-background-color (color-name)
--- a/lisp/gnus/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,20 @@ +2006-12-13 Reiner Steib <Reiner.Steib@gmx.de> + + * legacy-gnus-agent.el: Add Copyright notice. + +2006-12-12 Chong Yidong <cyd@stupidchicken.com> + + * gnus-sum.el (gnus-make-thread-indent-array): Fix last change. + +2006-12-08 Chong Yidong <cyd@stupidchicken.com> + + * gnus-sum.el (gnus-make-thread-indent-array): New optional arg + specifying array size. + (gnus-summary-insert-line, gnus-summary-prepare-threads): Regrow indent + array if it is too small. + (gnus-sort-threads-recursive): Renamed from gnus-sort-thread-1. + (gnus-sort-threads-loop): New function. + 2006-12-06 Chris Moore <dooglus@gmail.com> (tiny change) * gnus-sum.el (gnus-sort-threads, gnus-summary-limit-children):
--- a/lisp/gnus/ChangeLog.1 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/ChangeLog.1 Sat Dec 16 01:29:26 2006 +0000 @@ -3726,7 +3726,8 @@ * gnus.el: Quassia Gnus v0.1 is released. - Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 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.
--- a/lisp/gnus/ChangeLog.2 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/ChangeLog.2 Sat Dec 16 01:29:26 2006 +0000 @@ -18857,7 +18857,8 @@ See ChangeLog.1 for earlier changes. - Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 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.
--- a/lisp/gnus/format-spec.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/format-spec.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; format-spec.el --- functions for formatting arbitrary formatting strings -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/gnus-async.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-async.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gnus-async.el --- asynchronous support for Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/gnus-audio.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-audio.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gnus-audio.el --- Sound effects for Gnus -;; Copyright (C) 1996, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Steven L. Baur <steve@miranova.com>
--- a/lisp/gnus/gnus-demon.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-demon.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gnus-demon.el --- daemonic Gnus behaviour -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/gnus-dup.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-dup.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gnus-dup.el --- suppression of duplicate articles in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/gnus-kill.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-kill.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gnus-kill.el --- kill commands for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
--- a/lisp/gnus/gnus-mh.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-mh.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gnus-mh.el --- mh-e interface for Gnus -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
--- a/lisp/gnus/gnus-move.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-move.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gnus-move.el --- commands for moving Gnus from one server to another -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/gnus-nocem.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-nocem.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/gnus-soup.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-soup.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gnus-soup.el --- SOUP packet writing support for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Per Abrahamsen <abraham@iesd.auc.dk>
--- a/lisp/gnus/gnus-sum.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-sum.el Sat Dec 16 01:29:26 2006 +0000 @@ -3343,16 +3343,17 @@ t (not (cdr (gnus-data-find-list article))))) -(defun gnus-make-thread-indent-array () - (let ((n 200)) - (unless (and gnus-thread-indent-array - (= gnus-thread-indent-level gnus-thread-indent-array-level)) - (setq gnus-thread-indent-array (make-vector 201 "") - gnus-thread-indent-array-level gnus-thread-indent-level) - (while (>= n 0) - (aset gnus-thread-indent-array n - (make-string (* n gnus-thread-indent-level) ? )) - (setq n (1- n)))))) +(defun gnus-make-thread-indent-array (&optional n) + (when (or n + (progn (setq n 200) nil) + (null gnus-thread-indent-array) + (/= gnus-thread-indent-level gnus-thread-indent-array-level)) + (setq gnus-thread-indent-array (make-vector (1+ n) "") + gnus-thread-indent-array-level gnus-thread-indent-level) + (while (>= n 0) + (aset gnus-thread-indent-array n + (make-string (* n gnus-thread-indent-level) ? )) + (setq n (1- n))))) (defun gnus-update-summary-mark-positions () "Compute where the summary marks are to go." @@ -3451,6 +3452,9 @@ gnus-tmp-expirable gnus-tmp-subject-or-nil &optional gnus-tmp-dummy gnus-tmp-score gnus-tmp-process) + (if (>= gnus-tmp-level (length gnus-thread-indent-array)) + (gnus-make-thread-indent-array (max (* 2 (length gnus-thread-indent-array)) + gnus-tmp-level))) (let* ((gnus-tmp-indentation (aref gnus-thread-indent-array gnus-tmp-level)) (gnus-tmp-lines (mail-header-lines gnus-tmp-header)) (gnus-tmp-score (or gnus-tmp-score gnus-summary-default-score 0)) @@ -4549,23 +4553,46 @@ (1+ (gnus-point-at-eol)) (gnus-delete-line))))))) -(defun gnus-sort-threads-1 (threads func) +(defun gnus-sort-threads-recursive (threads func) (sort (mapcar (lambda (thread) (cons (car thread) (and (cdr thread) - (gnus-sort-threads-1 (cdr thread) func)))) + (gnus-sort-threads-recursive (cdr thread) func)))) threads) func)) +(defun gnus-sort-threads-loop (threads func) + (let* ((superthread (cons nil threads)) + (stack (list (cons superthread threads))) + remaining-threads thread) + (while stack + (setq remaining-threads (cdr (car stack))) + (if remaining-threads + (progn (setq thread (car remaining-threads)) + (setcdr (car stack) (cdr remaining-threads)) + (if (cdr thread) + (push (cons thread (cdr thread)) stack))) + (setq thread (caar stack)) + (setcdr thread (sort (cdr thread) func)) + (pop stack))) + (cdr superthread))) + (defun gnus-sort-threads (threads) "Sort THREADS." (if (not gnus-thread-sort-functions) threads (gnus-message 8 "Sorting threads...") - (let ((max-lisp-eval-depth (max 5000 max-lisp-eval-depth))) - (prog1 (gnus-sort-threads-1 - threads - (gnus-make-sort-function gnus-thread-sort-functions)) - (gnus-message 8 "Sorting threads...done"))))) + (prog1 + (condition-case nil + (let ((max-lisp-eval-depth (max max-lisp-eval-depth 5000))) + (gnus-sort-threads-recursive + threads (gnus-make-sort-function gnus-thread-sort-functions))) + ;; Even after binding max-lisp-eval-depth, the recursive + ;; sorter might fail for very long threads. In that case, + ;; try using a (less well-tested) non-recursive sorter. + (error (gnus-sort-threads-loop + threads (gnus-make-sort-function + gnus-thread-sort-functions)))) + (gnus-message 8 "Sorting threads...done")))) (defun gnus-sort-articles (articles) "Sort ARTICLES." @@ -4990,6 +5017,10 @@ gnus-tmp-closing-bracket ?\>) (setq gnus-tmp-opening-bracket ?\[ gnus-tmp-closing-bracket ?\])) + (if (>= gnus-tmp-level (length gnus-thread-indent-array)) + (gnus-make-thread-indent-array + (max (* 2 (length gnus-thread-indent-array)) + gnus-tmp-level))) (setq gnus-tmp-indentation (aref gnus-thread-indent-array gnus-tmp-level)
--- a/lisp/gnus/gnus-undo.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/gnus-undo.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gnus-undo.el --- minor mode for undoing in Gnus -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/legacy-gnus-agent.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/legacy-gnus-agent.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,10 +1,39 @@ +;;; gnus-agent.el --- Legacy unplugged support for Gnus + +;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. + +;; Author: Kevin Greiner <kgreiner@xpediantsolutions.com> +;; Keywords: news + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Commentary: + +;; Conversion functions for the Agent. + +;;; Code: (require 'gnus-start) (require 'gnus-util) (require 'gnus-range) (require 'gnus-agent) -; Oort Gnus v0.08 - This release updated agent to no longer use -; history file and to support a compressed alist. +;; Oort Gnus v0.08 - This release updated agent to no longer use +;; history file and to support a compressed alist. (defvar gnus-agent-compressed-agentview-search-only nil) @@ -224,4 +253,7 @@ ;; the .newsrc.eld file. (gnus-convert-mark-converter-prompt 'gnus-agent-unhook-expire-days t) -;;; arch-tag: 845c7b8a-88f7-4468-b8d7-94e8fc72cf1a +(provide 'legacy-gnus-agent) + +;; arch-tag: 845c7b8a-88f7-4468-b8d7-94e8fc72cf1a +;;; legacy-gnus-agent.el ends here
--- a/lisp/gnus/mail-parse.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/mail-parse.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; mail-parse.el --- Interface functions for parsing mail -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/mail-prsvr.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/mail-prsvr.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; mail-prsvr.el --- Interface variables for parsing mail -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/messcompat.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/messcompat.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; messcompat.el --- making message mode compatible with mail mode -;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/nndir.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/nndir.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; nndir.el --- single directory newsgroup access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/nnkiboze.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/nnkiboze.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; nnkiboze.el --- select virtual news access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/nnlistserv.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/nnlistserv.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; nnlistserv.el --- retrieving articles via web mailing list archives -;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/nnspool.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/nnspool.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; nnspool.el --- spool access for GNU Emacs ;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998, -;; 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet> ;; Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/nnwarchive.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/nnwarchive.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; nnwarchive.el --- interfacing with web archives -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
--- a/lisp/gnus/rfc1843.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/rfc1843.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rfc1843.el --- HZ (rfc1843) decoding -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
--- a/lisp/gnus/rfc2045.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/rfc2045.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rfc2045.el --- Functions for decoding rfc2045 headers -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/rfc2047.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/rfc2047.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
--- a/lisp/gnus/rfc2104.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/rfc2104.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Josefsson <jas@pdc.kth.se>
--- a/lisp/gnus/rfc2231.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/rfc2231.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rfc2231.el --- Functions for decoding rfc2231 headers -;; Copyright (C) 1998, 1999, 2000, 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>
--- a/lisp/gnus/starttls.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/starttls.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; starttls.el --- STARTTLS functions -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daiki Ueno <ueno@unixuser.org>
--- a/lisp/gnus/utf7.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/gnus/utf7.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; utf7.el --- UTF-7 encoding/decoding for Emacs -*-coding: iso-8859-1;-*- -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Jon K Hellan <hellan@acm.org>
--- a/lisp/help-fns.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/help-fns.el Sat Dec 16 01:29:26 2006 +0000 @@ -400,7 +400,7 @@ ;;;###autoload (defun variable-at-point (&optional any-symbol) - "Return the bound variable symbol found around point. + "Return the bound variable symbol found at or before point. Return 0 if there is no such symbol. If ANY-SYMBOL is non-nil, don't insist the symbol be bound." (or (condition-case ()
--- a/lisp/ido.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ido.el Sat Dec 16 01:29:26 2006 +0000 @@ -1566,7 +1566,8 @@ (define-key map [(meta down)] 'ido-next-work-directory) (define-key map [backspace] 'ido-delete-backward-updir) (define-key map "\d" 'ido-delete-backward-updir) - (define-key map [(meta backspace)] 'ido-delete-backward-word-updir) + (define-key map [remap backward-kill-word] 'ido-delete-backward-word-updir) ; M-DEL + (define-key map [(control backspace)] 'ido-up-directory) (define-key map "\C-l" 'ido-reread-directory) (define-key map [(meta ?d)] 'ido-wide-find-dir-or-delete-dir)
--- a/lisp/info.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/info.el Sat Dec 16 01:29:26 2006 +0000 @@ -2805,6 +2805,11 @@ (kill-buffer Info-complete-menu-buffer))))) (if (equal Info-current-file "dir") (error "The Info directory node has no index; use m to select a manual")) + ;; Strip leading colon in topic; index format does not allow them. + (if (and (stringp topic) + (> (length topic) 0) + (= (aref topic 0) ?:)) + (setq topic (substring topic 1))) (let ((orignode Info-current-node) (pattern (format "\n\\* +\\([^\n]*%s[^\n]*\\):[ \t]+\\([^\n]*\\)\\.\\(?:[ \t\n]*(line +\\([0-9]+\\))\\)?" (regexp-quote topic)))
--- a/lisp/international/ccl.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/ccl.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; ccl.el --- CCL (Code Conversion Language) compiler -;; Copyright (C) 1997, 1998, 2001, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1998, 1999, 2000 +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/international/characters.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/characters.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,9 @@ ;;; characters.el --- set syntax and category for multibyte characters -;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/international/codepage.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/codepage.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; codepage.el --- MS-DOS/MS-Windows specific coding systems ;; Copyright (C) 1998, 1999, 2000, 2002, 2005 Free Software Foundation, Inc. -;; Copyright (C) 2000 +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/international/encoded-kb.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/encoded-kb.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; encoded-kb.el --- handler to input multibyte characters encoded somehow -;; Copyright (C) 1997 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2004, 2005 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/international/fontset.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/fontset.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; fontset.el --- commands for handling fontset -;; Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003, 2006
--- a/lisp/international/isearch-x.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/isearch-x.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; isearch-x.el --- extended isearch handling commands -;; Copyright (C) 1997, 2001, 2004 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 2000 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/international/iso-ascii.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/iso-ascii.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; iso-ascii.el --- set up char tables for ISO 8859/1 on ASCII terminals -;; Copyright (C) 1987, 1995, 1998, 2003 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1995, 1998, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF
--- a/lisp/international/iso-cvt.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/iso-cvt.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,8 @@ ;;; iso-cvt.el --- translate ISO 8859-1 from/to various encodings -*- coding: iso-latin-1 -*- ;; This file was formerly called gm-lingo.el. -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2003, 2004 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Michael Gschwind <mike@vlsivie.tuwien.ac.at> ;; Keywords: tex, iso, latin, i18n
--- a/lisp/international/iso-transl.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/iso-transl.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; iso-transl.el --- keyboard input definitions for ISO 8859-1 -*- coding: iso-8859-1 -*- ;; Copyright (C) 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001 -;; Free Software Foundation, Inc. +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF
--- a/lisp/international/ja-dic-cnv.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/ja-dic-cnv.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp -;; Copyright (C) 1995, 2000 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/international/ja-dic-utl.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/ja-dic-utl.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; ja-dic-utl.el --- utilities for handling Japanese dictionary (SKK-JISYO.L) -;; Copyright (C) 1995, 2000 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/international/kinsoku.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/kinsoku.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; kinsoku.el --- `Kinsoku' processing funcs -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 2003 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/international/kkc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/kkc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; kkc.el --- Kana Kanji converter -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2003 +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/international/latin1-disp.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/latin1-disp.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n
--- a/lisp/international/mule-cmds.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/mule-cmds.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,9 @@ ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*- -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003 @@ -841,7 +842,7 @@ (let ((no-other-defaults nil) auto-cs) - (unless (or (stringp from) find-file-literally) + (unless (or (stringp from) find-file-literally) ;; Find an auto-coding that is specified for the the current ;; buffer and file from the region FROM and TO. (save-excursion @@ -903,7 +904,7 @@ (rassq base default-coding-system) (setq default-coding-system (append default-coding-system - (list (cons default-buffer-file-coding-system + (list (cons default-buffer-file-coding-system base))))))) ;; If the most preferred coding system has the property mime-charset, @@ -928,10 +929,10 @@ (let ((default-eol-type (coding-system-eol-type (caar default-coding-system)))) (if (and (vectorp default-eol-type) buffer-file-coding-system) - (setq default-eol-type (coding-system-eol-type + (setq default-eol-type (coding-system-eol-type buffer-file-coding-system))) (if (and (vectorp default-eol-type) default-buffer-file-coding-system) - (setq default-eol-type (coding-system-eol-type + (setq default-eol-type (coding-system-eol-type default-buffer-file-coding-system))) (if (and default-eol-type (not (vectorp default-eol-type))) (dolist (elt default-coding-system) @@ -1201,7 +1202,7 @@ (dolist (elt alist) (set-language-info-internal lang-env (car elt) (cdr elt))) - + (if (equal lang-env current-language-environment) (set-language-environment lang-env)))) @@ -1324,10 +1325,8 @@ (defun register-input-method (input-method lang-env &rest args) "Register INPUT-METHOD as an input method for language environment LANG-ENV. + INPUT-METHOD and LANG-ENV are symbols or strings. - -The remaining arguments are: - ACTIVATE-FUNC, TITLE, DESCRIPTION, and ARGS... ACTIVATE-FUNC is a function to call to activate this method. TITLE is a string to show in the mode line when this method is active. DESCRIPTION is a string describing this method and what it is good for. @@ -1345,7 +1344,8 @@ The commands `describe-input-method' and `list-input-methods' need these duplicated values to show some information about input methods -without loading the relevant Quail packages." +without loading the relevant Quail packages. +\n(fn INPUT-METHOD LANG-ENV ACTIVATE-FUNC TITLE DESCRIPTION &rest ARGS)" (if (symbolp lang-env) (setq lang-env (symbol-name lang-env))) (if (symbolp input-method) @@ -2552,7 +2552,11 @@ (not (coding-system-equal coding-system locale-coding-system))) (prefer-coding-system coding-system) + ;; Fixme: perhaps prefer-coding-system should set this too. + ;; But it's not the time to do such a fundamental change. + (setq default-sendmail-coding-system coding-system) (setq locale-coding-system coding-system)) + (when (get-language-info current-language-environment 'coding-priority) (let ((codeset (locale-info 'codeset)) (coding-system (car (coding-system-priority-list))))
--- a/lisp/international/mule-conf.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/mule-conf.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,8 @@ ;;; mule-conf.el --- configure multilingual environment -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2005 -;; Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/international/mule-diag.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/mule-diag.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,9 @@ ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule) -;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003 -;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/international/mule-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/mule-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,9 @@ ;;; mule-util.el --- utility functions for mulitilingual environment (mule) -;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 -;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2004 +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/international/mule.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/mule.el Sat Dec 16 01:29:26 2006 +0000 @@ -2,7 +2,8 @@ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/international/ogonek.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/ogonek.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; ogonek.el --- change the encoding of Polish diacritics -;; Copyright (C) 1997, 1998, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: W{\l}odek Bzyl, Ryszard Kubiak ;; Maintainer: rysiek@ipipan.gda.pl (Ryszard Kubiak)
--- a/lisp/international/quail.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/quail.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; quail.el --- provides simple input method for multilingual text -;; Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2003, 2004 +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/international/titdic-cnv.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/titdic-cnv.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002 +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/international/utf-7.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/international/utf-7.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; utf-7.el --- utf-7 coding system -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n, mail
--- a/lisp/isearchb.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/isearchb.el Sat Dec 16 01:29:26 2006 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2004, 2005, 2006 John Wiegley ;; Author: John Wiegley <johnw@gnu.org> +;; Maintainer: FSF ;; Created: 16 Apr 2004 ;; Version: 1.5 ;; Keywords: lisp
--- a/lisp/language/china-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/china-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,9 @@ ;;; china-util.el --- utilities for Chinese -*- coding: iso-2022-7bit -*- -;; Copyright (C) 1995, 2001, 2003 +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 2003 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/chinese.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/chinese.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/cyril-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/cyril-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; cyril-util.el --- utilities for Cyrillic scripts -;; Copyright (C) 1997, 1998, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Keywords: mule, multilingual, Cyrillic
--- a/lisp/language/cyrillic.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/cyrillic.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998, 2001, 2002, 2003 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004 +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/czech.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/czech.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; czech.el --- support for Czech -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1998, 2001 Free Software Foundation. +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Maintainer: Pavel Jan,Am(Bk <Pavel@Janik.cz>
--- a/lisp/language/devan-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/devan-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,8 @@ ;;; devan-util.el --- Support for composing Devanagari characters -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 1997, 1998, 2001, 2002, 2003 +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2000 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/language/devanagari.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/devanagari.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; devanagari.el --- Support for Devanagari -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Indian, Devanagari
--- a/lisp/language/english.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/english.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ ;;; english.el --- support for English -*- no-byte-compile: t -*- -;; Copyright (C) 1997 Free Software Foundation, Inc. -;; Copyright (C) 1997 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/ethio-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/ethio-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,8 @@ ;;; ethio-util.el --- utilities for Ethiopic -*- coding: utf-8-emacs; -*- -;; Copyright (C) 1997, 1998, 2002 +;; Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2001, 2004, 2005 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2005, 2006
--- a/lisp/language/ethiopic.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/ethiopic.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; ethiopic.el --- support for Ethiopic -*- coding: utf-8-emacs; -*- -;; Copyright (C) 1997 Free Software Foundation, Inc. -;; Copyright (C) 1995, 2001, 2006 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/language/european.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/european.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,8 +1,9 @@ ;;; european.el --- support for European languages -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004 +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/georgian.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/georgian.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; georgian.el --- language support for Georgian -*- no-byte-compile: t -*- -;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n
--- a/lisp/language/greek.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/greek.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,9 +1,11 @@ ;;; greek.el --- support for Greek -*- no-byte-compile: t -*- ;; Copyright (C) 2002 Free Software Foundation, Inc. -;; Copyright (C) 1995 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 + ;; Copyright (C) 2003 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009
--- a/lisp/language/hebrew.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/hebrew.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,9 +1,12 @@ ;;; hebrew.el --- support for Hebrew -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 2001, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1995 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 + ;; Copyright (C) 2003 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009
--- a/lisp/language/ind-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/ind-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; ind-util.el --- Transliteration and Misc. Tools for Indian Languages -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 2001, 2003 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Indian, Devanagari
--- a/lisp/language/indian.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/indian.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ ;;; indian.el --- Indian languages support -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 1999, 2001 Free Software Foundation, Inc. -;; Copyright (C) 2002, 2003 +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/language/japan-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/japan-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 2001 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1998, 2000, 2003 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/language/japanese.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/japanese.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1997 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/kannada.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/kannada.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; kannada.el --- Support for Kannada -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: CHOWKSEY, Kailash C. <klchxbec@m-net.arbornet.org> ;; Keywords: multilingual, Indian, Kannada
--- a/lisp/language/knd-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/knd-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; knd-util.el --- Support for composing Kannada characters -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: Maintainer: CHOWKSEY, Kailash C. <klchxbec@m-net.arbornet.org> ;; Keywords: multilingual, Kannada
--- a/lisp/language/korea-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/korea-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ ;;; korea-util.el --- utilities for Korean -;; Copyright (C) 1997, 1999 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999 +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/language/korean.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/korean.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1998 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1998 +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/lao-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/lao-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ ;;; lao-util.el --- utilities for Lao -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 2001 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2000 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/lao.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/lao.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; lao.el --- support for Lao -*- coding: iso-2022-7bit; no-byte-compile: t -*- ;; Copyright (C) 2001 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1998, 1999, 2002 +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/malayalam.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/malayalam.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; malayalam.el --- Support for Malayalam -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Indian, Malayalam
--- a/lisp/language/misc-lang.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/misc-lang.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; misc-lang.el --- support for miscellaneous languages (characters) -*- no-byte-compile: t -*- -;; Copyright (C) 1995, 1997 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/language/mlm-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/mlm-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; mlm-util.el --- support for composing malayalam characters -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Malayalam
--- a/lisp/language/romanian.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/romanian.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; romanian.el --- support for Romanian -*- coding: iso-latin-2; no-byte-compile: t -*- -;; Copyright (C) 1998, 2002 Free Software Foundation. +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation. ;; Author: Dan Nicolaescu <done@ece.arizona.edu> ;; Keywords: multilingual, Romanian, i18n
--- a/lisp/language/slovak.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/slovak.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; slovak.el --- support for Slovak -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1998, 2001 Free Software Foundation. +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation. ;; Authors: Tibor ,B)(Bimko <tibor.simko@fmph.uniba.sk>, ;; Milan Zamazal <pdm@zamazal.org>
--- a/lisp/language/tamil.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/tamil.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; tamil.el --- Support for Tamil -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <batta@beige.ocn.ne.jp> ;; Keywords: multilingual, Indian, Tamil
--- a/lisp/language/thai-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/thai-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,9 +1,11 @@ ;;; thai-util.el --- utilities for Thai -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2005 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 -;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Keywords: mule, multilingual, Thai, i18n
--- a/lisp/language/thai-word.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/thai-word.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; thai-word.el -- find Thai word boundaries -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/language/thai.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/thai.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,12 +1,14 @@ ;;; thai.el --- support for Thai -*- coding: iso-2022-7bit; no-byte-compile: t -*- -;; Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2005 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 ;; Copyright (C) 2005 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 -;; Copyright (C) 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. ;; Keywords: multilingual, Thai, i18n
--- a/lisp/language/tibet-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/tibet-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; tibet-util.el --- utilities for Tibetan -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 2000 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021
--- a/lisp/language/tibetan.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/tibetan.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ ;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1997, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1997, 1999, 2000 +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/tml-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/tml-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; tml-util.el --- support for composing tamil characters -*-coding: iso-2022-7bit;-*- -;; Copyright (C) 2001 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org> ;; Keywords: multilingual, Indian, Tamil
--- a/lisp/language/utf-8-lang.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/utf-8-lang.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; utf-8-lang.el --- generic UTF-8 language environment -*- no-byte-compile: t -*- -;; Copyright (C) 2001 Free Software Foundation, Inc. +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org> ;; Keywords: i18n
--- a/lisp/language/viet-util.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/viet-util.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; viet-util.el --- utilities for Vietnamese -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1998 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997 +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/language/vietnamese.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/language/vietnamese.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,9 @@ ;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*- -;; Copyright (C) 1998, 2002 Free Software Foundation, Inc. -;; Copyright (C) 1995, 1997, 1998, 2000 +;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 ;; Copyright (C) 2003
--- a/lisp/mail/blessmail.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/blessmail.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*- -;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/mail/footnote.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/footnote.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; footnote.el --- footnote support for message mode -*- coding: iso-latin-1;-*- -;; Copyright (C) 1997, 2000, 2002, 2003, 2004, +;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Steven L Baur <steve@xemacs.org>
--- a/lisp/mail/mail-hist.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/mail-hist.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; mail-hist.el --- headers and message body history for outgoing mail -;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Karl Fogel <kfogel@red-bean.com>
--- a/lisp/mail/mailabbrev.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/mailabbrev.el Sat Dec 16 01:29:26 2006 +0000 @@ -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, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1996, 1997, 2000, 2001, +;; 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Jamie Zawinski <jwz@lucid.com>, now <jwz@jwz.org> ;; Maintainer: FSF
--- a/lisp/mail/mailalias.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/mailalias.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; mailalias.el --- expand and complete mailing address aliases -;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2002, 2003, +;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2001, 2002, 2003, ;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/mail/mailheader.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/mailheader.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; mailheader.el --- mail header parsing, merging, formatting -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Erik Naggum <erik@naggum.no>
--- a/lisp/mail/metamail.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/metamail.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; metamail.el --- Metamail interface for GNU Emacs -;; Copyright (C) 1993, 1996, 2002, 2003, 2004, +;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
--- a/lisp/mail/mspools.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/mspools.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; mspools.el --- show mail spools waiting to be read -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Stephen Eglen <stephen@gnu.org>
--- a/lisp/mail/reporter.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/reporter.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; reporter.el --- customizable bug reporting of lisp programs -;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: 1993-1998 Barry A. Warsaw ;; Maintainer: FSF
--- a/lisp/mail/rfc2368.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/rfc2368.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,11 +1,11 @@ ;;; rfc2368.el --- support for rfc2368 +;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. + ;; Author: Sen Nagata <sen@eccosys.com> ;; Keywords: mail -;; Copyright (C) 1998, 2000, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/lisp/mail/rfc822.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/rfc822.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rfc822.el --- hairy rfc822 parser for mail and news and suchlike -;; Copyright (C) 1986, 1987, 1990, 2002, 2003, 2004, +;; Copyright (C) 1986, 1987, 1990, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
--- a/lisp/mail/rmailmsc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/rmailmsc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/mail/supercite.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/supercite.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; supercite.el --- minor mode for citing mail and news replies -;; Copyright (C) 1993, 1997, 2002, 2003, 2004, +;; Copyright (C) 1993, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org>
--- a/lisp/mail/uce.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/uce.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; uce.el --- facilitate reply to unsolicited commercial email -;; Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: stanislav shalunov <shalunov@mccme.ru>
--- a/lisp/mail/undigest.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/undigest.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; undigest.el --- digest-cracking support for the RMAIL mail reader -;; Copyright (C) 1985, 1986, 1994, 1996, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1994, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/mail/unrmail.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/unrmail.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; unrmail.el --- convert Rmail files to mailbox files -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/mail/vms-pmail.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mail/vms-pmail.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; vms-pmail.el --- use Emacs as the editor within VMS mail -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Roland B Roberts <roberts@panix.com>
--- a/lisp/makefile.w32-in Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/makefile.w32-in Sat Dec 16 01:29:26 2006 +0000 @@ -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. #
--- a/lisp/man.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/man.el Sat Dec 16 01:29:26 2006 +0000 @@ -428,13 +428,17 @@ 'follow-link t 'help-echo "mouse-2, RET: display this man page" 'func nil - 'action (lambda (button) - (funcall - (button-get button 'func) - (let ((func (button-get button 'Man-target-string))) - (if func - (if (functionp func) (funcall func) func) - (button-label button)))))) + 'action #'Man-xref-button-action) + +(defun Man-xref-button-action (button) + (let ((target (button-get button 'Man-target-string))) + (funcall + (button-get button 'func) + (cond ((null target) + (button-label button)) + ((functionp target) + (funcall target (button-start button))) + (t target))))) (define-button-type 'Man-xref-man-page :supertype 'Man-abstract-xref-man-page @@ -636,11 +640,12 @@ ;; ====================================================================== ;; default man entry: get word under point -(defsubst Man-default-man-entry () - "Make a guess at a default manual entry. -This guess is based on the text surrounding the cursor." +(defsubst Man-default-man-entry (&optional pos) + "Make a guess at a default manual entry based on the text at POS. +If POS is nil, the current point is used." (let (word) (save-excursion + (if pos (goto-char pos)) ;; Default man entry title is any word the cursor is on, or if ;; cursor not on a word, then nearest preceding word. (skip-chars-backward "-a-zA-Z0-9._+:")
--- a/lisp/menu-bar.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/menu-bar.el Sat Dec 16 01:29:26 2006 +0000 @@ -924,13 +924,13 @@ (define-key menu-bar-showhide-menu [showhide-tooltip-mode] (list 'menu-item "Tooltips" 'tooltip-mode - :help "Toggle tooltips on/off" + :help "Turn tooltips on/off" :visible `(and (display-graphic-p) (fboundp 'x-show-tip)) :button `(:toggle . tooltip-mode))) (define-key menu-bar-showhide-menu [menu-bar-mode] '(menu-item "Menu-bar" menu-bar-mode - :help "Toggle menu-bar on/off" + :help "Turn menu-bar on/off" :button (:toggle . menu-bar-mode))) (define-key menu-bar-showhide-menu [showhide-tool-bar] @@ -1127,7 +1127,8 @@ '(menu-item "Programmable Calculator" calc :help "Invoke the Emacs built-in full scientific calculator")) (define-key menu-bar-tools-menu [calendar] - '(menu-item "Calendar" calendar)) + '(menu-item "Calendar" calendar + :help "Invoke the Emacs built-in calendar")) (define-key menu-bar-tools-menu [separator-net] '("--")) @@ -1386,12 +1387,14 @@ '(menu-item "Send Bug Report..." report-emacs-bug :help "Send e-mail to Emacs maintainers")) (define-key menu-bar-help-menu [emacs-problems] - '(menu-item "Emacs Known Problems" view-emacs-problems)) + '(menu-item "Emacs Known Problems" view-emacs-problems + :help "Read about known problems with Emacs")) (define-key menu-bar-help-menu [emacs-news] '(menu-item "Emacs News" view-emacs-news :help "New features of this version")) (define-key menu-bar-help-menu [emacs-faq] - '(menu-item "Emacs FAQ" view-emacs-FAQ)) + '(menu-item "Emacs FAQ" view-emacs-FAQ + :help "Frequently asked (and answered) questions about Emacs")) (defun help-with-tutorial-spec-language () "Use the Emacs tutorial, specifying which language you want."
--- a/lisp/mh-e/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mh-e/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -2868,7 +2868,7 @@ * ChangeLog.1: New file. Contains old ChangeLog. - 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 in any medium without royalty provided the copyright
--- a/lisp/mh-e/ChangeLog.1 Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mh-e/ChangeLog.1 Sat Dec 16 01:29:26 2006 +0000 @@ -11407,7 +11407,7 @@ (dist): Leave release in current directory. - Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright
--- a/lisp/mouse-sel.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/mouse-sel.el Sat Dec 16 01:29:26 2006 +0000 @@ -244,6 +244,10 @@ :group 'mouse-sel (if mouse-sel-mode (progn + ;; If mouse-2 has never been done by the user, initialize the + ;; `event-kind' property to ensure that `follow-link' clicks + ;; are interpreted correctly. + (put 'mouse-2 'event-kind 'mouse-click) (add-hook 'x-lost-selection-functions 'mouse-sel-lost-selection-hook) (when mouse-sel-default-bindings ;; Save original bindings and replace them with new ones.
--- a/lisp/net/browse-url.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/browse-url.el Sat Dec 16 01:29:26 2006 +0000 @@ -760,17 +760,23 @@ (interactive (browse-url-interactive-arg "URL: ")) (unless (interactive-p) (setq args (or args (list browse-url-new-window-flag)))) - (if (functionp browse-url-browser-function) - (apply browse-url-browser-function url args) - ;; The `function' can be an alist; look down it for first match - ;; and apply the function (which might be a lambda). - (catch 'done - (dolist (bf browse-url-browser-function) - (when (string-match (car bf) url) - (apply (cdr bf) url args) - (throw 'done t))) - (error "No browse-url-browser-function matching URL %s" - url)))) + (let ((process-environment (copy-sequence process-environment))) + ;; When connected to various displays, be careful to use the display of + ;; the currently selected frame, rather than the original start display, + ;; which may not even exist any more. + (if (stringp (frame-parameter (selected-frame) 'display)) + (setenv "DISPLAY" (frame-parameter (selected-frame) 'display))) + (if (functionp browse-url-browser-function) + (apply browse-url-browser-function url args) + ;; The `function' can be an alist; look down it for first match + ;; and apply the function (which might be a lambda). + (catch 'done + (dolist (bf browse-url-browser-function) + (when (string-match (car bf) url) + (apply (cdr bf) url args) + (throw 'done t))) + (error "No browse-url-browser-function matching URL %s" + url))))) ;;;###autoload (defun browse-url-at-point (&optional arg)
--- a/lisp/net/eudc-bob.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/eudc-bob.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; eudc-bob.el --- Binary Objects Support for EUDC -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr>
--- a/lisp/net/eudc-export.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/eudc-export.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; eudc-export.el --- functions to export EUDC query results -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr>
--- a/lisp/net/eudc-hotlist.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/eudc-hotlist.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; eudc-hotlist.el --- hotlist management for EUDC -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr>
--- a/lisp/net/eudc-vars.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/eudc-vars.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; eudc-vars.el --- Emacs Unified Directory Client -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr>
--- a/lisp/net/eudc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/eudc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; eudc.el --- Emacs Unified Directory Client -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr>
--- a/lisp/net/eudcb-bbdb.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/eudcb-bbdb.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr>
--- a/lisp/net/eudcb-ldap.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/eudcb-ldap.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr>
--- a/lisp/net/eudcb-mab.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/eudcb-mab.el Sat Dec 16 01:29:26 2006 +0000 @@ -3,6 +3,7 @@ ;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@newartisans.com> +;; Maintainer: FSF ;; Keywords: comm ;; This file is part of GNU Emacs.
--- a/lisp/net/eudcb-ph.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/eudcb-ph.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr>
--- a/lisp/net/ldap.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/ldap.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; ldap.el --- client interface to LDAP for Emacs -;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Oscar Figueiredo <oscar@cpe.fr>
--- a/lisp/net/rcompile.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/rcompile.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rcompile.el --- run a compilation on a remote machine -;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Albert <alon@milcse.rtsg.mot.com>
--- a/lisp/net/rlogin.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/rlogin.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; rlogin.el --- remote login interface -;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004, -;; 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003, +;; 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Noah Friedman ;; Maintainer: Noah Friedman <friedman@splode.com>
--- a/lisp/net/snmp-mode.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/snmp-mode.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode -;; Copyright (C) 1995, 1998, 2002, 2003, 2004, +;; Copyright (C) 1995, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Paul D. Smith <psmith@BayNetworks.com>
--- a/lisp/net/telnet.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/telnet.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; telnet.el --- run a telnet session from within an Emacs buffer -;; Copyright (C) 1985, 1988, 1992, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: William F. Schelter
--- a/lisp/net/webjump.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/net/webjump.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; webjump.el --- programmable Web hotlist -;; Copyright (C) 1996, 1997, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Neil W. Van Dyke <nwv@acm.org>
--- a/lisp/obsolete/awk-mode.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/awk-mode.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; awk-mode.el --- AWK code editing commands for Emacs -;; Copyright (C) 1988, 1994, 1996, 2000, 2002, 2003, 2004, +;; Copyright (C) 1988, 1994, 1996, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/obsolete/fast-lock.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/fast-lock.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; fast-lock.el --- automagic text properties caching for fast Font Lock mode -;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2002, 2003, 2004, +;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Simon Marshall <simon@gnu.org>
--- a/lisp/obsolete/float.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/float.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; float.el --- obsolete floating point arithmetic package -;; Copyright (C) 1986, 2002, 2003, 2004, 2005, +;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Bill Rosenblatt
--- a/lisp/obsolete/hscroll.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/hscroll.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; hscroll.el --- automatically scroll truncated lines horizontally -;; Copyright (C) 1992, 1993, 1995, 1996, 2002, 2003, 2004, +;; Copyright (C) 1992, 1993, 1995, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Wayne Mesard <wmesard@esd.sgi.com>
--- a/lisp/obsolete/iso-insert.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/iso-insert.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; iso-insert.el --- insert functions for ISO 8859/1 -*- coding: iso-8859-1;-*- -;; Copyright (C) 1987, 1994, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF
--- a/lisp/obsolete/iso-swed.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/iso-swed.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; iso-swed.el --- set up char tables for ISO 8859/1 for Swedish/Finnish ttys -;; Copyright (C) 1987, 2002, 2003, 2004, 2005, +;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Howard Gayle
--- a/lisp/obsolete/keyswap.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/keyswap.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; keyswap.el --- swap BS and DEL keys -*- no-byte-compile: t -*- -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
--- a/lisp/obsolete/mlsupport.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/mlsupport.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; mlsupport.el --- run-time support for mocklisp code -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/obsolete/ooutline.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/ooutline.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; ooutline.el --- outline mode commands for Emacs -;; Copyright (C) 1986, 1993, 1994, 1997, 2002, 2003, 2004, +;; Copyright (C) 1986, 1993, 1994, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/obsolete/options.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/options.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; options.el --- edit Options command for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/obsolete/profile.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/profile.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; profile.el --- Emacs profiler (OBSOLETE; use elp.el instead) -;; Copyright (C) 1992, 1994, 1998, 2002, 2003, 2004, +;; Copyright (C) 1992, 1994, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
--- a/lisp/obsolete/rnews.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/rnews.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rnews.el --- USENET news reader for GNU Emacs -;; Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/obsolete/rnewspost.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/rnewspost.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rnewspost.el --- USENET news poster/mailer for GNU Emacs -;; Copyright (C) 1985, 1986, 1987, 1995, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 1987, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/obsolete/rsz-mini.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/rsz-mini.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; rsz-mini.el --- dynamically resize minibuffer to display entire contents -;; Copyright (C) 1990, 1993, 1994, 1995, 1997, 2002, 2003, 2004, +;; Copyright (C) 1990, 1993, 1994, 1995, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Noah Friedman <friedman@splode.com>
--- a/lisp/obsolete/scribe.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/scribe.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; scribe.el --- scribe mode, and its idiosyncratic commands -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/obsolete/sun-curs.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/sun-curs.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; sun-curs.el --- cursor definitions for Sun windows -;; Copyright (C) 1987, 2002, 2003, 2004, 2005, +;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jeff Peck <peck@sun.com>
--- a/lisp/obsolete/sun-fns.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/sun-fns.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; sun-fns.el --- subroutines of Mouse handling for Sun windows -;; Copyright (C) 1987, 2002, 2003, 2004, 2005, +;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jeff Peck <peck@sun.com>
--- a/lisp/obsolete/swedish.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/swedish.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; swedish.el --- miscellaneous functions for dealing with Swedish -;; Copyright (C) 1988, 2001 Free Software Foundation, Inc. +;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Howard Gayle ;; Maintainer: FSF
--- a/lisp/obsolete/x-apollo.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/x-apollo.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; x-apollo.el --- Apollo support functions -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs.
--- a/lisp/obsolete/x-menu.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/obsolete/x-menu.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; x-menu.el --- menu support for X -;; Copyright (C) 1986, 2002, 2003, 2004, 2005, +;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; This file is part of GNU Emacs.
--- a/lisp/play/5x5.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/5x5.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; 5x5.el --- simple little puzzle game -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Dave Pearson <davep@davep.org>
--- a/lisp/play/bruce.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/bruce.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; bruce.el --- bruce phrase utility for overloading the Communications -*- no-byte-compile: t -*- ;;; Decency Act snoops, if any. -;; Copyright (C) 1988, 1993, 1997, 2002, 2003, 2004, +;; Copyright (C) 1988, 1993, 1997, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/play/cookie1.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/cookie1.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; cookie1.el --- retrieve random phrases from fortune cookie files -;; Copyright (C) 1993, 2002, 2003, 2004, 2005, 2006, +;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, ;; 2006 Free Software Foundation, Inc. ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
--- a/lisp/play/decipher.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/decipher.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; decipher.el --- cryptanalyze monoalphabetic substitution ciphers ;; -;; Copyright (C) 1995, 1996, 2002, 2003, 2004, +;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; ;; Author: Christopher J. Madsen <chris_madsen@geocities.com>
--- a/lisp/play/dissociate.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/dissociate.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; dissociate.el --- scramble text amusingly for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/play/doctor.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/doctor.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; doctor.el --- psychological help for frustrated users -;; Copyright (C) 1985, 1987, 1994, 1996, 2000, 2002, 2003, 2004, +;; Copyright (C) 1985, 1987, 1994, 1996, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/play/gamegrid.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/gamegrid.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gamegrid.el --- library for implementing grid-based games on Emacs -;; Copyright (C) 1997, 1998, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Glynn Clements <glynn@sensei.co.uk>
--- a/lisp/play/gametree.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/gametree.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; gametree.el --- manage game analysis trees in Emacs -;; Copyright (C) 1997, 1999, 2002, 2003, 2004, +;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Ian T Zimmerman <itz@rahul.net>
--- a/lisp/play/handwrite.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/handwrite.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: iso-latin-1; -*- -;; Copyright (C) 1996, 2002, 2003, 2004, 2005, +;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Danny Roozendaal (was: <danny@tvs.kun.nl>)
--- a/lisp/play/landmark.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/landmark.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; landmark.el --- neural-network robot that learns landmarks -;; Copyright (C) 1996, 1997, 2000, 2002, 2003, 2004, +;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Terrence Brannon (was: <brannon@rana.usc.edu>)
--- a/lisp/play/morse.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/morse.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; morse.el --- convert text to morse code and back -*- coding: utf-8 -*- -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Rick Farnbach <rick_farnbach@MENTORG.COM>
--- a/lisp/play/mpuz.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/mpuz.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; mpuz.el --- multiplication puzzle for GNU Emacs -;; Copyright (C) 1990, 2002, 2003, 2004, 2005, +;; Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
--- a/lisp/play/snake.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/snake.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; snake.el --- implementation of Snake for Emacs -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Glynn Clements <glynn@sensei.co.uk>
--- a/lisp/play/solitaire.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/solitaire.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; solitaire.el --- game of solitaire in Emacs Lisp -;; Copyright (C) 1994, 2002, 2003, 2004, 2005, +;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jan Schormann <Jan.Schormann@rechen-gilde.de>
--- a/lisp/play/spook.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/spook.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; spook.el --- spook phrase utility for overloading the NSA line eater -;; Copyright (C) 1988, 1993, 2002, 2003, 2004, +;; Copyright (C) 1988, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/play/tetris.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/tetris.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; tetris.el --- implementation of Tetris for Emacs -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Glynn Clements <glynn@sensei.co.uk>
--- a/lisp/play/yow.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/play/yow.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; yow.el --- quote random zippyisms -;; Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/progmodes/autoconf.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/progmodes/autoconf.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; autoconf.el --- mode for editing Autoconf configure.in files -;; Copyright (C) 2000, 2001, 2002 2003, 2004, 2005, 2006 +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org>
--- a/lisp/progmodes/cc-fonts.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/progmodes/cc-fonts.el Sat Dec 16 01:29:26 2006 +0000 @@ -1179,7 +1179,7 @@ ;; The below code attempts to fontify the case constants in ;; c-label-face-name, but it cannot catch every case [sic]. ;; And do we want to fontify case constants anyway? - nil + (c-forward-label t match-pos nil) ;;; (when (c-forward-label t match-pos nil) ;;; ;; Can't use `c-fontify-types-and-refs' here since we ;;; ;; should use the label face.
--- a/lisp/progmodes/cc-langs.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/progmodes/cc-langs.el Sat Dec 16 01:29:26 2006 +0000 @@ -1331,7 +1331,7 @@ (c-lang-defconst c-at-vsemi-p-fn "Contains a function \"Is there a virtual semicolon at POS or point?\". Such a function takes one optional parameter, a buffer position (defaults to -point), and returns NIL or t. This variable contains NIL for languages which +point), and returns nil or t. This variable contains nil for languages which don't have EOL terminated statements. " t nil awk 'c-awk-at-vsemi-p) @@ -1342,7 +1342,7 @@ The (admittedly kludgey) purpose of such a function is to prevent an infinite recursion in c-beginning-of-statement-1 when point starts at a `while' token. The function MUST NOT UNDER ANY CIRCUMSTANCES call c-beginning-of-statement-1, -even indirectly. This variable contains NIL for languages which don't have +even indirectly. This variable contains nil for languages which don't have EOL terminated statements." t nil awk 'c-awk-vsemi-status-unknown-p)
--- a/lisp/progmodes/glasses.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/progmodes/glasses.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ ;;; glasses.el --- make cantReadThis readable -;; Copyright (C) 1999, 2000, 2001, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org> ;; Maintainer: Milan Zamazal <pdm@zamazal.org>
--- a/lisp/progmodes/gud.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/progmodes/gud.el Sat Dec 16 01:29:26 2006 +0000 @@ -486,7 +486,7 @@ (car (nth 1 var-list)))) (setq char ?-) (setq char ?+)) - (if (string-match "\\*$" type) + (if (string-match "\\*$\\|\\*&$" type) (speedbar-make-tag-line 'bracket char 'gdb-speedbar-expand-node varnum
--- a/lisp/progmodes/idlw-help.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/progmodes/idlw-help.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,6 @@ ;;; 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,2006 Free Software Foundation +;; Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation ;; ;; Authors: J.D. Smith <jdsmith@as.arizona.edu> ;; Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/progmodes/idlwave.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/progmodes/idlwave.el Sat Dec 16 01:29:26 2006 +0000 @@ -427,11 +427,11 @@ :type 'integer) (defcustom idlwave-library-path nil - "Library path for Windows and MacOS (OS9). Not needed under Unix. + "Library path for Windows and MacOS (OS9). Not needed under UNIX. When selecting the directories to scan for IDL user catalog routine info, IDLWAVE can, under UNIX, query the shell for the exact search path \(the value of !PATH). However, under Windows and MacOS -(pre-OSX), the IDLWAVE shell does not work. In this case, this +\(pre-OSX), the IDLWAVE shell does not work. In this case, this variable can be set to specify the paths where IDLWAVE can find PRO files. The shell will only be asked for a list of paths when this variable is nil. The value is a list of directories. A directory @@ -1595,7 +1595,7 @@ (define-key idlwave-mode-map "\C-c\C-t" 'idlwave-find-module-this-file) (define-key idlwave-mode-map "\C-c?" 'idlwave-routine-info) (define-key idlwave-mode-map "\M-?" 'idlwave-context-help) -(define-key idlwave-mode-map [(control meta ?\?)] +(define-key idlwave-mode-map [(control meta ?\?)] 'idlwave-help-assistant-help-with-topic) ;; Pickup both forms of Esc/Meta binding (define-key idlwave-mode-map [(meta tab)] 'idlwave-complete) @@ -1942,7 +1942,7 @@ (set (make-local-variable 'parse-sexp-ignore-comments) t) ;; ChangeLog - (set (make-local-variable 'add-log-current-defun-function) + (set (make-local-variable 'add-log-current-defun-function) 'idlwave-current-routine-fullname) ;; Set tag table list to use IDLTAGS as file name. @@ -9236,7 +9236,7 @@ "--" ["Info" idlwave-info t] "--" - ["Help with Topic" idlwave-help-assistant-help-with-topic + ["Help with Topic" idlwave-help-assistant-help-with-topic idlwave-help-use-assistant] ["Launch IDL Help" idlwave-launch-idlhelp t])))
--- a/lisp/progmodes/ld-script.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/progmodes/ld-script.el Sat Dec 16 01:29:26 2006 +0000 @@ -89,7 +89,7 @@ ;; 3.5.2 PROVIDE "PROVIDE" ;; 3.5.3 PROVIDE_HIDDEN - "PROVIDE_HIDEN" + "PROVIDE_HIDDEN" ;; 3.6 SECTIONS Command "SECTIONS" ;; 3.6.4.2 Input Section Wildcard Patterns
--- a/lisp/progmodes/sh-script.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/progmodes/sh-script.el Sat Dec 16 01:29:26 2006 +0000 @@ -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, -;; 2006 Free Software Foundation, Inc. +;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002, +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org> ;; Version: 2.0f
--- a/lisp/progmodes/simula.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/progmodes/simula.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; simula.el --- SIMULA 87 code editing commands for Emacs -;; Copyright (C) 1992, 1994, 1996 2001, 2002, 2003, 2004, 2005, 2006 +;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. ;; Author: Hans Henrik Eriksen <hhe@ifi.uio.no>
--- a/lisp/ps-bdf.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/ps-bdf.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,10 +1,11 @@ ;;; ps-bdf.el --- BDF font file handler for ps-print -;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2006 +;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006 ;; Free Software Foundation, Inc. -;; Copyright (C) 1998, 1999, 2001, 2003 +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 + ;; Copyright (C) 2003 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009
--- a/lisp/replace.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/replace.el Sat Dec 16 01:29:26 2006 +0000 @@ -1341,7 +1341,7 @@ (defun replace-match-data (integers reuse &optional new) "Like `match-data', but markers in REUSE get invalidated. -If NEW is non-NIL, it is set and returned instead of fresh data, +If NEW is non-nil, it is set and returned instead of fresh data, but coerced to the correct value of INTEGERS." (or (and new (progn @@ -1357,7 +1357,7 @@ check for `\\?' is made to save time. MATCH-DATA is used for the replacement. In case editing is done, it is changed to use markers. -The return value is non-NIL if there has been no `\\?' or NOEDIT was +The return value is non-nil if there has been no `\\?' or NOEDIT was passed in. If LITERAL is set, no checking is done, anyway." (unless (or literal noedit) (setq noedit t) @@ -1486,7 +1486,7 @@ ;; For speed, use only integers and ;; reuse the list used last time. (replace-match-data t real-match-data))))) - + ;; Record whether the match is nonempty, to avoid an infinite loop ;; repeatedly matching the same empty string. (setq nonempty-match
--- a/lisp/shell.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/shell.el Sat Dec 16 01:29:26 2006 +0000 @@ -520,10 +520,10 @@ If BUFFER exists and shell process is running, just switch to BUFFER. Program used comes from variable `explicit-shell-file-name', or (if that is nil) from the ESHELL environment variable, - or else from SHELL if there is no ESHELL. + or (if that is nil) from `shell-file-name'. If a file `~/.emacs_SHELLNAME' exists, or `~/.emacs.d/init_SHELLNAME.sh', -it is given as initial input (Note that this may lose due to a timing -error if the shell discards input when it starts up). +it is given as initial input (but this may be lost, due to a timing +error, if the shell discards input when it starts up). The buffer is put in Shell mode, giving commands for sending input and controlling the subjobs of the shell. See `shell-mode'. See also the variable `shell-prompt-pattern'.
--- a/lisp/startup.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/startup.el Sat Dec 16 01:29:26 2006 +0000 @@ -1455,9 +1455,12 @@ (if (and (display-color-p) (image-type-available-p 'xpm)) "splash.xpm" "splash.pbm")))) - (image-height (and img (cdr (image-size img)))) - (window-height (1- (window-height (frame-selected-window frame))))) - (> window-height (+ image-height 19))))))) + (image-height (and img (cdr (image-size img nil frame)))) + ;; We test frame-height so that, if the frame is split + ;; by displaying a warning, that doesn't cause the normal + ;; splash screen to be used. + (frame-height (1- (frame-height frame)))) + (> frame-height (+ image-height 19))))))) (defun normal-splash-screen (&optional hide-on-input)
--- a/lisp/subr.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/subr.el Sat Dec 16 01:29:26 2006 +0000 @@ -943,7 +943,8 @@ (make-obsolete-variable 'directory-sep-char "do not use it." "21.1") (make-obsolete-variable 'mode-line-inverse-video "use the appropriate faces instead." "21.1") (make-obsolete-variable 'unread-command-char - "use `unread-command-events' instead. That variable is a list of events to reread, so it now uses nil to mean `no event', instead of -1." + "use `unread-command-events' instead. That variable is a list of events +to reread, so it now uses nil to mean `no event', instead of -1." "before 19.15") ;; Lisp manual only updated in 22.1.
--- a/lisp/term/AT386.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/AT386.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,11 +1,11 @@ ;;; AT386.el --- terminal support package for IBM AT keyboards -*- no-byte-compile: t -*- +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. + ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> ;; Keywords: terminals -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, -;; 2006 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/lisp/term/iris-ansi.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/iris-ansi.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*- -;; Copyright (C) 1997, 2002, 2003, 2004, 2005, +;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dan Nicolaescu <dann@ics.uci.edu>
--- a/lisp/term/mac-win.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/mac-win.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: utf-8 -;; Copyright (C) 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Andrew Choi <akochoi@mac.com> @@ -82,7 +82,6 @@ (defvar mac-service-selection) (defvar mac-system-script-code) (defvar mac-apple-event-map) -(defvar mac-atsu-font-table) (defvar mac-font-panel-mode) (defvar mac-ts-active-input-overlay) (defvar x-invocation-args) @@ -1841,7 +1840,8 @@ (let* ((ae (mac-event-ae event)) (fm-font-size (mac-ae-number ae "fmsz")) (atsu-font-id (mac-ae-number ae "auid")) - (attribute-values (gethash atsu-font-id mac-atsu-font-table))) + (attribute-values (and atsu-font-id + (mac-atsu-font-face-attributes atsu-font-id)))) (if fm-font-size (setq attribute-values `(:height ,(* 10 fm-font-size) ,@attribute-values)))
--- a/lisp/term/news.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/news.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*- -;; Copyright (C) 1989, 1993, 2002, 2003, 2004, +;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF
--- a/lisp/term/sun-mouse.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/sun-mouse.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; sun-mouse.el --- mouse handling for Sun windows -;; Copyright (C) 1987, 2002, 2003, 2004, 2005, +;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Jeff Peck
--- a/lisp/term/sup-mouse.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/sup-mouse.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; sup-mouse.el --- supdup mouse support for lisp machines -;; Copyright (C) 1985, 1986, 2002, 2003, 2004, +;; Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Wolfgang Rupprecht
--- a/lisp/term/tvi970.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/tvi970.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,11 +1,11 @@ ;;; tvi970.el --- terminal support for the Televideo 970 +;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005, +;; 2006 Free Software Foundation, Inc. + ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992 ;; Keywords: terminals -;; Copyright (C) 1992, 2002, 2003, 2004, 2005, -;; 2006 Free Software Foundation, Inc. - ;; This file is part of GNU Emacs. ;; GNU Emacs is free software; you can redistribute it and/or modify
--- a/lisp/term/vt100.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/vt100.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; vt100.el --- define VT100 function key sequences in function-key-map -;; Copyright (C) 1989, 1993, 2002, 2003, 2004, +;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: FSF
--- a/lisp/term/w32-win.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/w32-win.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; w32-win.el --- parse switches controlling interface with W32 window system -;; Copyright (C) 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kevin Gallo
--- a/lisp/term/wyse50.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/wyse50.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*- -;; Copyright (C) 1989, 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1989, 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org>,
--- a/lisp/term/xterm.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/term/xterm.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; xterm.el --- define function key sequences and standard colors for xterm -;; Copyright (C) 1995, 2002, 2003, 2004, 2005, +;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: FSF
--- a/lisp/textmodes/bib-mode.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/bib-mode.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; bib-mode.el --- major mode for editing bib files -;; Copyright (C) 1989, 2002, 2003, 2004, 2005, +;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/textmodes/bibtex.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/bibtex.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ ;;; bibtex.el --- BibTeX mode for GNU Emacs -;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, -;; 2004, 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, +;; 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de> ;; Bengt Martensson <bengt@mathematik.uni-Bremen.de>
--- a/lisp/textmodes/enriched.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/enriched.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; enriched.el --- read and save files in text/enriched format -;; Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004, +;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Boris Goldowsky <boris@gnu.org>
--- a/lisp/textmodes/flyspell.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/flyspell.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; flyspell.el --- on-the-fly spell checker -;; Copyright (C) 1998, 2000, 2002, 2003, 2004, +;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr> @@ -541,6 +541,11 @@ (member (or ispell-local-dictionary ispell-dictionary) flyspell-dictionaries-that-consider-dash-as-word-delimiter))))) +(defun flyspell-hack-local-variables-hook () + ;; When local variables are loaded, see if the dictionary context + ;; has changed. + (flyspell-accept-buffer-local-defs 'force)) + (defun flyspell-kill-ispell-hook () (setq flyspell-last-buffer nil) (dolist (buf (buffer-list)) @@ -579,6 +584,9 @@ (add-hook 'pre-command-hook (function flyspell-pre-command-hook) t t) ;; we bound flyspell action to after-change hook (add-hook 'after-change-functions 'flyspell-after-change-function nil t) + ;; we bound flyspell action to hack-local-variables-hook + (add-hook 'hack-local-variables-hook + (function flyspell-hack-local-variables-hook) t t) ;; set flyspell-generic-check-word-predicate based on the major mode (let ((mode-predicate (get major-mode 'flyspell-mode-predicate))) (if mode-predicate @@ -684,6 +692,8 @@ (remove-hook 'post-command-hook (function flyspell-post-command-hook) t) (remove-hook 'pre-command-hook (function flyspell-pre-command-hook) t) (remove-hook 'after-change-functions 'flyspell-after-change-function t) + (remove-hook 'hack-local-variables-hook + (function flyspell-hack-local-variables-hook) t) ;; we remove all the flyspell hilightings (flyspell-delete-all-overlays) ;; we have to erase pre cache variables
--- a/lisp/textmodes/makeinfo.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/makeinfo.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; makeinfo.el --- run makeinfo conveniently -;; Copyright (C) 1991, 1993, 2002, 2003, 2004, +;; Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Robert J. Chassell
--- a/lisp/textmodes/page-ext.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/page-ext.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; page-ext.el --- extended page handling commands -;; Copyright (C) 1990, 1991, 1993, 1994, 2002, 2003, 2004, +;; Copyright (C) 1990, 1991, 1993, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: Robert J. Chassell <bob@gnu.org>
--- a/lisp/textmodes/page.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/page.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; page.el --- page motion commands for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/textmodes/picture.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/picture.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model -;; Copyright (C) 1985, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: K. Shane Hartman
--- a/lisp/textmodes/refbib.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/refbib.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; refbib.el --- convert refer-style references to ones usable by Latex bib -;; Copyright (C) 1989, 2002, 2003, 2004, 2005, +;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Henry Kautz <kautz@research.att.com>
--- a/lisp/textmodes/refer.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/refer.el Sat Dec 16 01:29:26 2006 +0000 @@ -79,19 +79,19 @@ :group 'wp) (defcustom refer-bib-directory nil - "Directory, or list of directories, to search for \\.bib files. Can -be set to 'bibinputs or 'texinputs, in which case the environment + "Directory, or list of directories, to search for \\.bib files. +Can be set to 'bibinputs or 'texinputs, in which case the environment variable BIBINPUTS or TEXINPUTS, respectively, is used to obtain a -list of directories. Useful only if refer-bib-files is set to 'dir or -a list of file names (without directory). A value of nil indicates the +list of directories. Useful only if `refer-bib-files' is set to 'dir or +a list of file names (without directory). A value of nil indicates the current working directory. -If refer-bib-directory is 'bibinputs or 'texinputs, it is setq'd to +If `refer-bib-directory' is 'bibinputs or 'texinputs, it is setq'd to the appropriate list of directories when it is first used. Note that an empty directory is interpreted by BibTeX as indicating -the default search path. Since Refer does not know that default path, -it cannot search it. Include that path explicitly in your BIBINPUTS +the default search path. Since Refer does not know that default path, +it cannot search it. Include that path explicitly in your BIBINPUTS environment if you really want it searched (which is not likely to happen anyway)." :type '(choice (repeat directory) (const bibinputs) (const texinputs)) @@ -102,24 +102,24 @@ or one of the following special values: nil = prompt for \\.bib file (if visiting a \\.bib file, use it as default) auto = read \\.bib file names from appropriate command in buffer (see - refer-bib-files-regexp) unless the buffer's mode is bibtex-mode, + `refer-bib-files-regexp') unless the buffer's mode is `bibtex-mode', in which case only the buffer is searched -dir = use all \\.bib files in directories referenced by refer-bib-directory. +dir = use all \\.bib files in directories referenced by `refer-bib-directory'. If a specified file doesn't exist and has no extension, a \\.bib extension is automatically tried. -If refer-bib-files is nil, auto or dir, it is setq'd to the appropriate -list of files when it is first used if refer-cache-bib-files is t. If -refer-cache-bib-files is nil, the list of \\.bib files to use is re-read +If `refer-bib-files' is nil, auto or dir, it is setq'd to the appropriate +list of files when it is first used if `refer-cache-bib-files' is t. If +`refer-cache-bib-files' is nil, the list of \\.bib files to use is re-read each time it is needed." :type '(choice (repeat file) (const nil) (const auto) (const dir)) :group 'refer) (defcustom refer-cache-bib-files t - "*Variable determining whether the value of refer-bib-files should be cached. + "*Variable determining whether the value of `refer-bib-files' should be cached. If t, initialize the value of refer-bib-files the first time it is used. If -nil, re-read the list of \\.bib files depending on the value of refer-bib-files +nil, re-read the list of \\.bib files depending on the value of `refer-bib-files' each time it is needed." :type 'boolean :group 'refer) @@ -128,8 +128,8 @@ "*Regexp matching a bibliography file declaration. The current buffer is expected to contain a line such as \\bibliography{file1,file2,file3} -which is read to set up refer-bib-files. The regexp must specify the command -(such as \\bibliography) that is used to specify the list of bib files. The +which is read to set up `refer-bib-files'. The regexp must specify the command +\(such as \\bibliography) that is used to specify the list of bib files. The command is expected to specify a file name, or a list of comma-separated file names, within curly braces. If a specified file doesn't exist and has no extension, a \\.bib extension @@ -150,8 +150,8 @@ (defun refer-find-entry (keywords &optional continue) "Find entry in refer-bib-files containing KEYWORDS. If KEYWORDS is nil, prompt user for blank-separated list of keywords. -If CONTINUE is t, or if called interactively with a prefix arg, look for next -entry by continuing search from previous point." +If CONTINUE is non-nil, or if called interactively with a prefix arg, +look for next entry by continuing search from previous point." (interactive (list nil current-prefix-arg)) (or keywords (setq keywords (if continue refer-previous-keywords @@ -160,13 +160,13 @@ (refer-find-entry-internal keywords continue)) (defun refer-find-next-entry () - "Find next occurrence of entry in refer-bib-files. See refer-find-entry." + "Find next occurrence of entry in `refer-bib-files'. See `refer-find-entry'." (interactive) (refer-find-entry-internal refer-previous-keywords t)) (defun refer-yank-key () "Inserts at point in current buffer the \"key\" field of the entry -found on the last refer-find-entry or refer-find-next-entry." +found on the last `refer-find-entry' or `refer-find-next-entry'." (interactive) (let ((old-point (point))) (insert
--- a/lisp/textmodes/refill.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/refill.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; refill.el --- `auto-fill' by refilling paragraphs on changes -;; Copyright (C) 2000, 2002, 2003, 2004, 2005, +;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Dave Love <fx@gnu.org>
--- a/lisp/textmodes/reftex-auc.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/reftex-auc.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ ;;; reftex-auc.el --- RefTeX's interface to AUCTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/textmodes/reftex-cite.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/reftex-cite.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ ;;; reftex-cite.el --- creating citations with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/textmodes/reftex-dcr.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/reftex-dcr.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ ;;; reftex-dcr.el --- viewing cross references and citations with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/textmodes/reftex-global.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/reftex-global.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ ;;; reftex-global.el --- operations on entire documents with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/textmodes/reftex-index.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/reftex-index.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ ;;; reftex-index.el --- index support with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/textmodes/reftex-parse.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/reftex-parse.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ ;;; reftex-parse.el --- parser functions for RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/textmodes/reftex-ref.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/reftex-ref.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ ;;; reftex-ref.el --- code to create labels and references with RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/textmodes/reftex-sel.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/reftex-sel.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ ;;; reftex-sel.el --- the selection modes for RefTeX -;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2440, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/textmodes/reftex-vars.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/reftex-vars.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ ;;; reftex-vars.el --- configuration variables for RefTeX -;; Copyright (C) 1997, 1998, 1999, 2003, 2004, 2005, + +;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Author: Carsten Dominik <dominik@science.uva.nl>
--- a/lisp/textmodes/spell.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/spell.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; spell.el --- spelling correction interface for Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/textmodes/tex-mode.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/tex-mode.el Sat Dec 16 01:29:26 2006 +0000 @@ -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, 2006 Free Software Foundation, Inc. +;; 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: tex
--- a/lisp/textmodes/text-mode.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/text-mode.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; text-mode.el --- text mode, and its idiosyncratic commands -;; Copyright (C) 1985, 1992, 1994, 2002, 2003, 2004, +;; Copyright (C) 1985, 1992, 1994, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/textmodes/tildify.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/tildify.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; tildify.el --- adding hard spaces into texts -;; Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004, +;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Milan Zamazal <pdm@zamazal.org>
--- a/lisp/textmodes/two-column.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/two-column.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; two-column.el --- minor mode for editing of two-column text -;; Copyright (C) 1992, 1993, 1994, 1995, 2002, 2003, 2004, +;; Copyright (C) 1992, 1993, 1994, 1995, 2001, 2002, 2003, 2004, ;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
--- a/lisp/textmodes/underline.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/textmodes/underline.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs -;; Copyright (C) 1985, 2002, 2003, 2004, 2005, +;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, ;; 2006 Free Software Foundation, Inc. ;; Maintainer: FSF
--- a/lisp/url/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/url/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,7 @@ +2006-12-10 Juanma Barranquero <lekktu@gmail.com> + + * url-gw.el (url-gateway-nslookup-program): Doc fix. + 2006-11-26 Magnus Henoch <mange@freemail.hu> * url-http.el (url-http-wait-for-headers-change-function): Use
--- a/lisp/url/url-gw.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/url/url-gw.el Sat Dec 16 01:29:26 2006 +0000 @@ -104,7 +104,7 @@ :group 'url-gateway) (defcustom url-gateway-nslookup-program "nslookup" - "*If non-NIL then a string naming nslookup program." + "*If non-nil then a string naming nslookup program." :type '(choice (const :tag "None" :value nil) string) :group 'url-gateway) @@ -253,7 +253,7 @@ ;; Use non-blocking socket if we can. (make-network-process :name name :buffer buffer :host host :service service - :nowait + :nowait (featurep 'make-network-process '(:nowait t)))) (socks (socks-open-network-stream name buffer host service))
--- a/lisp/url/url-http.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/url/url-http.el Sat Dec 16 01:29:26 2006 +0000 @@ -149,31 +149,32 @@ (concat " (" (or url-system-type url-os-type) ")")) (t ""))))) -(defun url-http-create-request (url &optional ref-url) - "Create an HTTP request for URL, referred to by REF-URL." - (declare (special proxy-object proxy-info +(defun url-http-create-request (&optional ref-url) + "Create an HTTP request for `url-http-target-url', referred to by REF-URL." + (declare (special proxy-info url-http-method url-http-data url-http-extra-headers)) + (url-http-debug "url-proxy-object is %s\n" url-proxy-object) (let* ((extra-headers) (request nil) (no-cache (cdr-safe (assoc "Pragma" url-http-extra-headers))) - (proxy-obj (and (boundp 'proxy-object) proxy-object)) + (using-proxy (not (eq url-current-object url-http-target-url))) (proxy-auth (if (or (cdr-safe (assoc "Proxy-Authorization" url-http-extra-headers)) - (not proxy-obj)) + (not using-proxy)) nil (let ((url-basic-auth-storage 'url-http-proxy-basic-auth-storage)) - (url-get-authentication url nil 'any nil)))) - (real-fname (concat (url-filename (or proxy-obj url)) - (url-recreate-url-attributes (or proxy-obj url)))) - (host (url-host (or proxy-obj url))) + (url-get-authentication url-http-target-url nil 'any nil)))) + (real-fname (concat (url-filename url-http-target-url) + (url-recreate-url-attributes url-http-target-url))) + (host (url-host url-http-target-url)) (auth (if (cdr-safe (assoc "Authorization" url-http-extra-headers)) nil (url-get-authentication (or (and (boundp 'proxy-info) proxy-info) - url) nil 'any nil)))) + url-http-target-url) nil 'any nil)))) (if (equal "" real-fname) (setq real-fname "/")) (setq no-cache (and no-cache (string-match "no-cache" no-cache))) @@ -222,12 +223,12 @@ (list ;; The request (or url-http-method "GET") " " - (if proxy-obj (url-recreate-url proxy-obj) real-fname) + (if using-proxy (url-recreate-url url-http-target-url) real-fname) " HTTP/" url-http-version "\r\n" ;; Version of MIME we speak "MIME-Version: 1.0\r\n" ;; (maybe) Try to keep the connection open - "Connection: " (if (or proxy-obj + "Connection: " (if (or using-proxy (not url-http-attempt-keepalives)) "close" "keep-alive") "\r\n" ;; HTTP extensions we support @@ -235,11 +236,11 @@ (format "Extension: %s\r\n" url-extensions-header)) ;; Who we want to talk to - (if (/= (url-port (or proxy-obj url)) + (if (/= (url-port url-http-target-url) (url-scheme-get-property - (url-type (or proxy-obj url)) 'default-port)) + (url-type url-http-target-url) 'default-port)) (format - "Host: %s:%d\r\n" host (url-port (or proxy-obj url))) + "Host: %s:%d\r\n" host (url-port url-http-target-url)) (format "Host: %s\r\n" host)) ;; Who its from (if url-personal-mail-address @@ -266,11 +267,11 @@ auth ;; Cookies (url-cookie-generate-header-lines host real-fname - (equal "https" (url-type url))) + (equal "https" (url-type url-http-target-url))) ;; If-modified-since (if (and (not no-cache) (member url-http-method '("GET" nil))) - (let ((tm (url-is-cached (or proxy-obj url)))) + (let ((tm (url-is-cached url-http-target-url))) (if tm (concat "If-modified-since: " (url-get-normalized-date tm) "\r\n")))) @@ -1085,8 +1086,7 @@ url-http-chunked-length url-http-chunked-start url-http-chunked-counter - url-http-process - proxy-object)) + url-http-process)) (let ((connection (url-http-find-free-connection (url-host url) (url-port url))) (buffer (generate-new-buffer (format " *http %s:%d*" @@ -1122,7 +1122,6 @@ url-http-data url-http-target-url)) (set (make-local-variable var) nil)) - (make-local-variable 'proxy-object) (setq url-http-method (or url-request-method "GET") url-http-extra-headers url-request-extra-headers @@ -1134,9 +1133,8 @@ url-callback-function callback url-callback-arguments cbargs url-http-after-change-function 'url-http-wait-for-headers-change-function - url-http-target-url (if (boundp 'proxy-object) - proxy-object - url-current-object)) + url-http-target-url (or url-proxy-object + url-current-object)) (set-process-buffer connection buffer) (set-process-filter connection 'url-http-generic-filter) @@ -1151,7 +1149,7 @@ (url-port url))) (t (set-process-sentinel connection 'url-http-end-of-document-sentinel) - (process-send-string connection (url-http-create-request url))))))) + (process-send-string connection (url-http-create-request))))))) buffer)) (defun url-http-async-sentinel (proc why) @@ -1162,7 +1160,7 @@ (cond ((string= (substring why 0 4) "open") (set-process-sentinel proc 'url-http-end-of-document-sentinel) - (process-send-string proc (url-http-create-request url-http-target-url))) + (process-send-string proc (url-http-create-request))) (t (setf (car url-callback-arguments) (nconc (list :error (list 'error 'connection-failed why
--- a/lisp/url/url-proxy.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/url/url-proxy.el Sat Dec 16 01:29:26 2006 +0000 @@ -65,12 +65,18 @@ (url-warn 'url (format "Unknown proxy directive: %s" proxy) 'critical) nil)))) +(defvar url-proxy-object nil + "The URL to access through a proxy. +This variable is bound by `url-proxy'. If this is non-nil, the +scheme-specific loader should use its argument as the proxy, and +the value of this variable as the object to retrieve.") + (defun url-proxy (url callback &optional cbargs) ;; Retrieve URL from a proxy. ;; Expects `url-using-proxy' to be bound to the specific proxy to use." (setq url-using-proxy (url-generic-parse-url url-using-proxy)) - (let ((proxy-object (copy-sequence url))) - (url-set-target proxy-object nil) + (let ((url-proxy-object (copy-sequence url))) + (url-set-target url-proxy-object nil) (url-http url-using-proxy callback cbargs))) (provide 'url-proxy)
--- a/lisp/url/url.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/url/url.el Sat Dec 16 01:29:26 2006 +0000 @@ -172,6 +172,7 @@ (unless (url-type url) (error "Bad url: %s" (url-recreate-url url))) (let ((loader (url-scheme-get-property (url-type url) 'loader)) + (url-proxy-object nil) (url-using-proxy (if (url-host url) (url-find-proxy-for-url url (url-host url)))) (buffer nil)
--- a/lisp/w32-fns.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/w32-fns.el Sat Dec 16 01:29:26 2006 +0000 @@ -479,5 +479,19 @@ (expand-file-name (pop command-line-args-left)))) (batch-update-autoloads))) +(defun w32-append-code-lines (orig extra) + "Append non-empty non-comment lines in the file EXTRA to the file ORIG. + +This function saves all buffers and kills the Emacs session, without asking +for any permissions. + +This is required because the Windows build environment is not required +to include Sed, which is used by leim/Makefile.in to do the job." + (find-file orig) + (goto-char (point-max)) + (insert-file-contents extra) + (delete-matching-lines "^$\\|^;") + (save-buffers-kill-emacs t)) + ;;; arch-tag: c49b48cc-0f4f-454f-a274-c2dc34815e14 ;;; w32-fns.el ends here
--- a/lisp/wdired.el Fri Dec 15 01:34:17 2006 +0000 +++ b/lisp/wdired.el Sat Dec 16 01:29:26 2006 +0000 @@ -283,10 +283,13 @@ (when (and filename (not (member (file-name-nondirectory filename) '("." "..")))) (dired-move-to-filename) - (put-text-property (- (point) 2) (1- (point)) 'old-name filename) - (put-text-property b-protection (1- (point)) 'read-only t) - (setq b-protection (dired-move-to-end-of-filename t))) - (put-text-property (point) (1+ (point)) 'end-name t) + ;; The rear-nonsticky property below shall ensure that text preceding + ;; the filename can't be modified. + (add-text-properties + (1- (point)) (point) `(old-name ,filename rear-nonsticky (read-only))) + (put-text-property b-protection (point) 'read-only t) + (setq b-protection (dired-move-to-end-of-filename t)) + (put-text-property (point) (1+ (point)) 'end-name t)) (forward-line)) (put-text-property b-protection (point-max) 'read-only t)))) @@ -312,20 +315,21 @@ 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* ((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))))))) + (let (beg end file) + (save-excursion + (setq end (line-end-position)) + (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 (1+ 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)))))) (defun wdired-change-to-dired-mode () @@ -333,9 +337,9 @@ (or (eq major-mode 'wdired-mode) (error "Not a Wdired buffer")) (let ((inhibit-read-only t)) - (remove-text-properties (point-min) (point-max) - '(read-only nil local-map nil))) - (put-text-property 1 2 'front-sticky nil) + (remove-text-properties + (point-min) (point-max) + '(front-sticky nil rear-nonsticky nil read-only nil keymap nil))) (use-local-map dired-mode-map) (force-mode-line-update) (setq buffer-read-only t) @@ -368,46 +372,42 @@ (errors 0) file-ori file-new tmp-value) (save-excursion - (if (and wdired-allow-to-redirect-links - (fboundp 'make-symbolic-link)) - (progn - (setq tmp-value (wdired-do-symlink-changes)) - (setq errors (cdr tmp-value)) - (setq changes (car tmp-value)))) - (if (and wdired-allow-to-change-permissions - (boundp 'wdired-col-perm)) ; could have been changed - (progn - (setq tmp-value (wdired-do-perm-changes)) - (setq errors (+ errors (cdr tmp-value))) - (setq changes (or changes (car tmp-value))))) + (when (and wdired-allow-to-redirect-links + (fboundp 'make-symbolic-link)) + (setq tmp-value (wdired-do-symlink-changes)) + (setq errors (cdr tmp-value)) + (setq changes (car tmp-value))) + (when (and wdired-allow-to-change-permissions + (boundp 'wdired-col-perm)) ; could have been changed + (setq tmp-value (wdired-do-perm-changes)) + (setq errors (+ errors (cdr tmp-value))) + (setq changes (or changes (car tmp-value)))) (goto-char (point-max)) (while (not (bobp)) (setq file-ori (wdired-get-filename nil t)) - (if file-ori - (setq file-new (wdired-get-filename))) - (if (and file-ori (not (equal file-new file-ori))) - (progn - (setq changes t) - (if (not file-new) ;empty filename! - (setq files-deleted (cons file-ori files-deleted)) - (progn - (setq file-new (substitute-in-file-name file-new)) - (if wdired-use-interactive-rename - (wdired-search-and-rename file-ori file-new) - ;; If dired-rename-file autoloads dired-aux while - ;; dired-backup-overwrite is locally bound, - ;; dired-backup-overwrite won't be initialized. - ;; So we must ensure dired-aux is loaded. - (require 'dired-aux) - (condition-case err - (let ((dired-backup-overwrite nil)) - (dired-rename-file file-ori file-new - overwrite)) - (error - (setq errors (1+ errors)) - (dired-log (concat "Rename `" file-ori "' to `" - file-new "' failed:\n%s\n") - err)))))))) + (when file-ori + (setq file-new (wdired-get-filename))) + (when (and file-ori (not (equal file-new file-ori))) + (setq changes t) + (if (not file-new) ;empty filename! + (setq files-deleted (cons file-ori files-deleted)) + (setq file-new (substitute-in-file-name file-new)) + (if wdired-use-interactive-rename + (wdired-search-and-rename file-ori file-new) + ;; If dired-rename-file autoloads dired-aux while + ;; dired-backup-overwrite is locally bound, + ;; dired-backup-overwrite won't be initialized. + ;; So we must ensure dired-aux is loaded. + (require 'dired-aux) + (condition-case err + (let ((dired-backup-overwrite nil)) + (dired-rename-file file-ori file-new + overwrite)) + (error + (setq errors (1+ errors)) + (dired-log (concat "Rename `" file-ori "' to `" + file-new "' failed:\n%s\n") + err)))))) (forward-line -1))) (if changes (revert-buffer) ;The "revert" is necessary to re-sort the buffer @@ -417,10 +417,10 @@ end-link nil end-perm nil old-perm nil perm-changed nil)) (message "(No changes to be performed)"))) - (if files-deleted - (wdired-flag-for-deletion files-deleted)) - (if (> errors 0) - (dired-log-summary (format "%d rename actions failed" errors) nil))) + (when files-deleted + (wdired-flag-for-deletion files-deleted)) + (when (> errors 0) + (dired-log-summary (format "%d rename actions failed" errors) nil))) (set-buffer-modified-p nil) (setq buffer-undo-list nil)) @@ -446,10 +446,9 @@ (dired-do-create-files-regexp (function dired-rename-file) "Move" 1 ".*" filename-new nil t)) - (progn - (forward-line -1) - (beginning-of-line) - (setq exit-while (= 1 (point))))))))) + (forward-line -1) + (beginning-of-line) + (setq exit-while (bobp))))))) ;; marks a list of files for deletion (defun wdired-flag-for-deletion (filenames-ori) @@ -518,7 +517,10 @@ (1- (match-beginning 1)) 'old-link (match-string-no-properties 1)) (put-text-property (match-end 1) (1+ (match-end 1)) 'end-link t) - (put-text-property (1- (match-beginning 1)) + (put-text-property (1- (match-beginning 1)) + (match-beginning 1) + 'rear-nonsticky '(read-only)) + (put-text-property (match-beginning 1) (match-end 1) 'read-only nil))) (forward-line) (beginning-of-line))))) @@ -527,15 +529,17 @@ (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 (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)))))) + (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)))) + ;; Perform the changes in the target of the changed links. (defun wdired-do-symlink-changes () @@ -613,29 +617,34 @@ (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 +;; Put a keymap property to the permission bits of the files, and store the ;; original name and permissions as a property (defun wdired-preprocess-perms () - (let ((inhibit-read-only t) - filename) + (let ((inhibit-read-only t)) (set (make-local-variable 'wdired-col-perm) nil) (save-excursion (goto-char (point-min)) (while (not (eobp)) - (if (and (not (looking-at dired-re-sym)) - (setq filename (wdired-get-filename))) - (progn - (re-search-forward dired-re-perms) - (or wdired-col-perm - (setq wdired-col-perm (- (current-column) 9))) - (if (eq wdired-allow-to-change-permissions 'advanced) - (put-text-property (match-beginning 0) (match-end 0) - 'read-only nil) - (put-text-property (1+ (match-beginning 0)) (match-end 0) - '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)))) + (when (and (not (looking-at dired-re-sym)) + (wdired-get-filename) + (re-search-forward dired-re-perms (line-end-position) 'eol)) + (let ((begin (match-beginning 0)) + (end (match-end 0))) + (unless wdired-col-perm + (setq wdired-col-perm (- (current-column) 9))) + (if (eq wdired-allow-to-change-permissions 'advanced) + (progn + (put-text-property begin end 'read-only nil) + ;; make first permission bit writable + (put-text-property + (1- begin) begin 'rear-nonsticky '(read-only))) + ;; avoid that keymap applies to text following permissions + (add-text-properties + (1+ begin) end + `(keymap ,wdired-perm-mode-map rear-nonsticky (keymap)))) + (put-text-property end (1+ end) 'end-perm t) + (put-text-property + begin (1+ begin) 'old-perm (match-string-no-properties 0)))) (forward-line) (beginning-of-line))))) @@ -661,24 +670,27 @@ (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)) + (put-text-property (1- pos-prop) pos-prop 'perm-changed t) + (put-text-property (1- (point)) (point) 'rear-nonsticky '(keymap))) (forward-char 1))) (defun wdired-toggle-bit () "Toggle the permission bit at point." (interactive) (let ((inhibit-read-only t) - (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"))) + (new-bit "-") (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 '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))) + (put-text-property (1- pos-prop) pos-prop 'perm-changed t) + (put-text-property (1- (point)) (point) 'rear-nonsticky '(keymap)))) (defun wdired-mouse-toggle-bit (event) "Toggle the permission bit that was left clicked." @@ -690,28 +702,23 @@ ;; 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) - (+ - (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)))) + (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)) ;; Perform the changes in the permissions of the files that have ;; changed.
--- a/lispref/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/lispref/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,33 @@ +2006-12-11 Richard Stallman <rms@gnu.org> + + * modes.texi (Font Lock Basics): Explain how nil for font-lock-defaults + affects face menu. Explain how to make it non-nil without enabling + any fontification. + +2006-12-10 Chong Yidong <cyd@stupidchicken.com> + + * modes.texi (Font Lock Basics): Document nil value of + font-lock-defaults. + +2006-12-10 Glenn Morris <rgm@gnu.org> + + * abbrevs.texi (Defining Abbrevs): Mention `define-abbrev' 'force + value for system-flag argument. Abbrev tables may not be empty + when major modes are loaded. + +2006-12-08 Juanma Barranquero <lekktu@gmail.com> + + * makefile.w32-in (maintainer-clean): Partially revert last + change; delete "elisp-?" and "elisp-??" instead of "elisp-*" + to protect elisp-covers.texi. + +2006-12-07 Juanma Barranquero <lekktu@gmail.com> + + * makefile.w32-in (maintainer-clean): Depend on `distclean'. + Don't remove elisp* info files; they are already deleted by the + `clean' and `distclean' targets, and they are in the $(infodir) + directory, not the current one. + 2006-12-04 Kim F. Storm <storm@cua.dk> * commands.texi (Misc Events): Update signal events.
--- a/lispref/abbrevs.texi Fri Dec 15 01:34:17 2006 +0000 +++ b/lispref/abbrevs.texi Sat Dec 16 01:29:26 2006 +0000 @@ -131,9 +131,12 @@ @comment node-name, next, previous, up @section Defining Abbrevs @code{define-abbrev} is the low-level basic function for defining an -abbrev in a specified abbrev table. When major modes predefine -standard abbrevs, they should call @code{define-abbrev} and specify -@code{t} for @var{system-flag}. +abbrev in a specified abbrev table. When major modes predefine standard +abbrevs, they should call @code{define-abbrev} and specify @code{t} for +@var{system-flag}. Be aware that any saved non-``system'' abbrevs are +restored at startup, i.e. before some major modes are loaded. Major modes +should therefore not assume that when they are first loaded their abbrev +tables are empty. @defun define-abbrev table name expansion &optional hook count system-flag This function defines an abbrev named @var{name}, in @var{table}, to @@ -165,7 +168,10 @@ if expansion had not really occurred. If @var{system-flag} is non-@code{nil}, that marks the abbrev as a -``system'' abbrev with the @code{system-type} property. +``system'' abbrev with the @code{system-type} property. Unless +@var{system-flag} has the value @code{force}, a ``system'' abbrev will +not overwrite an existing definition for a non-``system'' abbrev of the +same name. Normally the function @code{define-abbrev} sets the variable @code{abbrevs-changed} to @code{t}, if it actually changes the abbrev.
--- a/lispref/makefile.w32-in Fri Dec 15 01:34:17 2006 +0000 +++ b/lispref/makefile.w32-in Sat Dec 16 01:29:26 2006 +0000 @@ -119,5 +119,5 @@ distclean: clean -maintainer-clean: clean - - $(DEL) elisp elisp-* elisp.dvi elisp.oaux +maintainer-clean: distclean + - $(DEL) elisp elisp-? elisp-?? elisp.dvi elisp.oaux
--- a/lispref/modes.texi Fri Dec 15 01:34:17 2006 +0000 +++ b/lispref/modes.texi Sat Dec 16 01:29:26 2006 +0000 @@ -2358,7 +2358,12 @@ @defvar font-lock-defaults This variable is set by major modes, as a buffer-local variable, to specify how to fontify text in that mode. It automatically becomes -buffer-local when you set it. The value should look like this: +buffer-local when you set it. If its value is @code{nil}, Font-Lock +mode does no highlighting, and you can use the @samp{Faces} menu +(under @samp{Edit} and then @samp{Text Properties} in the menu bar) to +assign faces explicitly to text in the buffer. + +If non-@code{nil}, the value should look like this: @example (@var{keywords} [@var{keywords-only} [@var{case-fold} @@ -2374,9 +2379,10 @@ symbol how to do level 2, and so on. @xref{Levels of Font Lock}. The second element, @var{keywords-only}, specifies the value of the -variable @code{font-lock-keywords-only}. If this is non-@code{nil}, -syntactic fontification (of strings and comments) is not performed. -@xref{Syntactic Font Lock}. +variable @code{font-lock-keywords-only}. If this is omitted or +@code{nil}, syntactic fontification (of strings and comments) is also +performed. If this is non-@code{nil}, such fontification is not +performed. @xref{Syntactic Font Lock}. The third element, @var{case-fold}, specifies the value of @code{font-lock-keywords-case-fold-search}. If it is non-@code{nil}, @@ -2403,6 +2409,13 @@ elements. @xref{Other Font Lock Variables}. @end defvar + If your mode fontifies text explicitly by adding +@code{font-lock-face} properties, it can specify @code{(nil t)} for +@code{font-lock-defaults} to turn off all automatic fontification. +However, this is not required; it is possible to fontify some things +using @code{font-lock-face} properties and set up automatic +fontification for other parts of the text. + @node Search-based Fontification @subsection Search-based Fontification
--- a/man/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/man/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,39 @@ +2006-12-15 Eli Zaretskii <eliz@gnu.org> + + * text.texi (HTML Mode): Fix "C-c TAB". + +2006-12-13 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.texi (Hiding Headers): Document that `long-to' and `many-to' + also applies to Cc. + +2006-12-12 Reiner Steib <Reiner.Steib@gmx.de> + + * gnus.texi (X-Face): Clarify. Say which programs are required on + Windows. + +2006-12-09 Richard Stallman <rms@gnu.org> + + * misc.texi (Invoking emacsclient): Simplify TCP file text. + +2006-12-08 Kevin Rodgers <ihs_4664@yahoo.com> + + * files.texi (Misc File Ops): Document insert-file-literally. + +2006-12-08 Eli Zaretskii <eliz@gnu.org> + + * cmdargs.texi (Colors): Note that --color is intended for overriding + the terminal defaults, not for normal invocation. + + * misc.texi (Emacs Server): Improve wording. Don't mention the + ``server program''. Add a cross-reference to "Init File" node. + (Invoking emacsclient): Add index entries. Document both short and + long versions of command-line options. Document the -f option. + +2006-12-08 Michael Olson <mwolson@gnu.org> + + * erc.texi (Modules): Remove documentation for list module. + 2006-12-06 Richard Stallman <rms@gnu.org> * text.texi (Outline Format): Say to set outline-regexp
--- a/man/cmdargs.texi Fri Dec 15 01:34:17 2006 +0000 +++ b/man/cmdargs.texi Sat Dec 16 01:29:26 2006 +0000 @@ -951,8 +951,12 @@ @item --color=@var{mode} @opindex --color @cindex standard colors on a character terminal -For a character terminal only, specify the mode of color support. The -parameter @var{mode} can be one of the following: +@cindex override character terminal color support +For a character terminal only, specify the mode of color support. +This option is intended for overriding the number of supported colors +that the character terminal advertises in its @code{termcap} or +@code{terminfo} database. The parameter @var{mode} can be one of the +following: @table @samp @item never @itemx no
--- a/man/erc.texi Fri Dec 15 01:34:17 2006 +0000 +++ b/man/erc.texi Sat Dec 16 01:29:26 2006 +0000 @@ -422,10 +422,6 @@ @item irccontrols Highlight or remove IRC control characters -@cindex modules, list -@item list -List channels nicely in a separate buffer - @cindex modules, log @item log Save buffers in logs
--- a/man/files.texi Fri Dec 15 01:34:17 2006 +0000 +++ b/man/files.texi Sat Dec 16 01:29:26 2006 +0000 @@ -2433,6 +2433,13 @@ contents of the specified file into the current buffer at point, leaving point unchanged before the contents and the mark after them. +@findex insert-file-literally + @kbd{M-x insert-file-literally} is like @kbd{C-x i}, except it +inserts the specified file with no conversion of the contents: no +format conversion (@pxref{Formatted Text}), no character code +conversion (@pxref{Coding Systems}), and no automatic uncompression +(@pxref{Compressed Files}). + @findex write-region @kbd{M-x write-region} is the inverse of @kbd{M-x insert-file}; it copies the contents of the region into the specified file. @kbd{M-x
--- a/man/gnus.texi Fri Dec 15 01:34:17 2006 +0000 +++ b/man/gnus.texi Sat Dec 16 01:29:26 2006 +0000 @@ -10975,15 +10975,15 @@ Remove the @code{To} header if it only contains the address identical to the current group's @code{to-list} parameter. @item cc-list -Remove the @code{CC} header if it only contains the address identical to +Remove the @code{Cc} header if it only contains the address identical to the current group's @code{to-list} parameter. @item date Remove the @code{Date} header if the article is less than three days old. @item long-to -Remove the @code{To} header if it is very long. +Remove the @code{To} and/or @code{Cc} header if it is very long. @item many-to -Remove all @code{To} headers if there are more than one. +Remove all @code{To} and/or @code{Cc} headers if there are more than one. @end table To include these three elements, you could say something like: @@ -22175,21 +22175,26 @@ has image support the default action is to display the face before the @code{From} header. If there's no native @code{X-Face} support, Gnus will try to convert the @code{X-Face} header using external programs -from the @code{pbmplus} package and friends. For XEmacs it's faster if -XEmacs has been compiled with @code{X-Face} support. The default action -under Emacs without image support is to fork off the @code{display} -program. - -On a GNU/Linux system, the @code{display} program is from the +from the @code{pbmplus} package and friends, see below. For XEmacs it's +faster if XEmacs has been compiled with @code{X-Face} support. The +default action under Emacs without image support is to fork off the +@code{display} program. + +On a GNU/Linux system, the @code{display} program is included in the ImageMagick package. For external conversion programs look for packages with names like @code{netpbm}, @code{libgr-progs} and @code{compface}. - -The variable that controls this is the -@code{gnus-article-x-face-command} variable. If this variable is a +On Windows, you may use the packages @code{netpbm} and @code{compface} +from @url{http://gnuwin32.sourceforge.net}. You need to add the +@code{bin} directory to your @code{PATH} environment variable. +@c In fact only the following DLLs and binaries seem to be required: +@c compface1.dll uncompface.exe libnetpbm10.dll icontopbm.exe + +The variable @code{gnus-article-x-face-command} controls which programs +are used to display the @code{X-Face} header. If this variable is a string, this string will be executed in a sub-shell. If it is a function, this function will be called with the face as the argument. -If @code{gnus-article-x-face-too-ugly} (which is a regexp) matches -the @code{From} header, the face will not be shown. +If @code{gnus-article-x-face-too-ugly} (which is a regexp) matches the +@code{From} header, the face will not be shown. (Note: @code{x-face} is used in the variable/function names, not @code{xface}).
--- a/man/misc.texi Fri Dec 15 01:34:17 2006 +0000 +++ b/man/misc.texi Sat Dec 16 01:29:26 2006 +0000 @@ -1244,28 +1244,36 @@ @env{EDITOR} to @samp{emacs}, they invoke Emacs---but in an inconvenient fashion, by starting a new, separate Emacs process. This is inconvenient because it takes time and because the new Emacs process -doesn't share the buffers in any existing Emacs process. +doesn't share the buffers with any existing Emacs process. You can arrange to use your existing Emacs process as the editor for -programs like @code{mail} by using the Emacs client and Emacs server -programs. Here is how. +programs like @code{mail} by using the Emacs client program and the +server that is part of Emacs. Here is how. @cindex @env{TEXEDIT} environment variable - First, the preparation. Within Emacs, call the function -@code{server-start}. (Your @file{.emacs} file can do this automatically -if you add the expression @code{(server-start)} to it.) Then, outside -Emacs, set the @env{EDITOR} environment variable to @samp{emacsclient}. -(Note that some programs use a different environment variable; for -example, to make @TeX{} use @samp{emacsclient}, you should set the -@env{TEXEDIT} environment variable to @samp{emacsclient +%d %s}.) +@findex server-start + First, the preparations. Within Emacs, call the function +@code{server-start}. (Your @file{.emacs} init file can do this +automatically if you add the expression @code{(server-start)} to it, +see @ref{Init File}.) Then, outside Emacs, set the @env{EDITOR} +environment variable to @samp{emacsclient}. (Note that some programs +use a different environment variable; for example, to make @TeX{} use +@samp{emacsclient}, you should set the @env{TEXEDIT} environment +variable to @samp{emacsclient +%d %s}.) + +@pindex emacs.bash +@cindex Bash command to use Emacs server + As an alternative to using @code{emacsclient}, the file +@file{etc/emacs.bash} defines a Bash command @code{edit} which will +communicate with a running Emacs session, or start one if none exist. @kindex C-x # @findex server-edit - Then, whenever any program invokes your specified @env{EDITOR} + Now, whenever any program invokes your specified @env{EDITOR} program, the effect is to send a message to your principal Emacs telling it to visit a file. (That's what the program @code{emacsclient} does.) Emacs displays the buffer immediately and you can immediately begin -editing it. +editing it in the already running Emacs session. When you've finished editing that buffer, type @kbd{C-x #} (@code{server-edit}). This saves the file and sends a message back to @@ -1297,8 +1305,8 @@ each one a unique ``server name'', using the variable @code{server-name}. For example, @kbd{M-x set-variable @key{RET} server-name @key{RET} foo @key{RET}} sets the server name to -@samp{foo}. The @code{emacsclient} program can visit a server by name -using the @samp{-s} option. @xref{Invoking emacsclient}. +@samp{foo}. The @code{emacsclient} program can specify a server by +name using the @samp{-s} option. @xref{Invoking emacsclient}. While @code{mail} or another application is waiting for @code{emacsclient} to finish, @code{emacsclient} does not read terminal @@ -1335,6 +1343,7 @@ @node Invoking emacsclient,, Emacs Server, Emacs Server @subsection Invoking @code{emacsclient} +@cindex @code{emacsclient} invocation and options To run the @code{emacsclient} program, specify file names as arguments, and optionally line numbers as well, like this: @@ -1363,37 +1372,52 @@ @code{emacsclient}, then it returns immediately. (You can take as long as you like to edit the files in Emacs.) - The option @samp{--alternate-editor=@var{command}} specifies a -command to run if @code{emacsclient} fails to contact Emacs. This is -useful when running @code{emacsclient} in a script. For example, the -following setting for the @env{EDITOR} environment variable will -always give you an editor, even if no Emacs server is running: + The option @samp{-a @var{command}} or +@samp{--alternate-editor=@var{command}} specifies a command to run if +@code{emacsclient} fails to contact Emacs. This is useful when +running @code{emacsclient} in a script. For example, the following +setting for the @env{EDITOR} environment variable will always give you +an editor, even if no Emacs server is running: @example EDITOR="emacsclient --alternate-editor emacs +%d %s" @end example @noindent +@cindex @env{ALTERNATE_EDITOR} environment variable The environment variable @env{ALTERNATE_EDITOR} has the same effect, with the value of the @samp{--alternate-editor} option taking precedence. -@pindex emacs.bash - Alternatively, the file @file{etc/emacs.bash} defines a bash -function which will communicate with a running Emacs server, or start -one if none exists. - If you use several displays, you can tell Emacs on which display to -open the given files with the option @samp{--display=@var{DISPLAY}}. -This can be used typically when connecting from home to an Emacs -server running on your machine at your workplace. +open the given files with the @samp{-d @var{display}} or +@samp{--display=@var{display}} option to @code{emacsclient}. This is +handy when connecting from home to an Emacs session running on your +machine at your workplace. If there is more than one Emacs server running, you can specify a -server name with the option @samp{-s @var{name}}. +server name with the @samp{-s @var{name}} or +@samp{--socket-name=@var{name}} option to @code{emacsclient}. (This +option is not supported on MS-Windows.) You can also use @code{emacsclient} to execute any piece of Emacs Lisp -code, using the option @samp{--eval}. When this option is given, the -rest of the arguments is not taken as a list of files to visit but as -a list of expressions to evaluate. +code, using the @samp{-e} or @samp{--eval} option. When this option +is given, the rest of the arguments is interpreted as a list of +expressions to evaluate, not a list of files to visit. + +@cindex @env{EMACS_SERVER_FILE} environment variable +When you start the Emacs server (by calling @code{server-start}), +Emacs creates a file with information about TCP connection to the +server: the host where Emacs is running, the port where it is +listening, and an authentication string. @code{emacsclient} uses this +information if it needs to connect to the server via TCP. By default, +the file goes in the @file{~/.emacs.d/server/} directory@footnote{On +MS-Windows, if @env{HOME} is not set or the TCP configuration file +cannot be found there, Emacs also looks for the file in the +@file{.emacs.d/server/} subdirectory of the directory pointed to by +the @env{APPDATA} environment variable.}. You can specify the file +name to use with the @samp{-f @var{file}} or +@samp{--server-file=@var{file}} options, or by setting +@env{EMACS_SERVER_FILE} environment variable to the file name. @node Printing, Sorting, Emacs Server, Top @section Printing Hard Copies
--- a/man/text.texi Fri Dec 15 01:34:17 2006 +0000 +++ b/man/text.texi Sat Dec 16 01:29:26 2006 +0000 @@ -1844,7 +1844,7 @@ Run a shell command (which you must specify) to validate the current buffer as SGML (@code{sgml-validate}). -@item C-x TAB +@item C-c TAB @kindex C-c TAB @r{(SGML mode)} @findex sgml-tags-invisible Toggle the visibility of existing tags in the buffer. This can be
--- a/oldXMenu/Activate.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/Activate.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,5 @@ /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ #include "copyright.h"
--- a/oldXMenu/AddPane.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/AddPane.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/AddSel.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/AddSel.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/ChgPane.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/ChgPane.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/ChgSel.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/ChgSel.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/Create.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/Create.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,5 @@ /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ #include "copyright.h"
--- a/oldXMenu/DelPane.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/DelPane.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/DelSel.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/DelSel.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/Destroy.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/Destroy.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/Error.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/Error.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/EvHand.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/EvHand.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/FindPane.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/FindPane.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/FindSel.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/FindSel.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/InsPane.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/InsPane.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/InsSel.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/InsSel.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/Internal.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/Internal.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/Locate.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/Locate.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/Post.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/Post.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/Recomp.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/Recomp.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/SetAEQ.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/SetAEQ.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/SetFrz.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/SetFrz.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/SetPane.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/SetPane.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/SetSel.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/SetSel.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/X10.h Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/X10.h Sat Dec 16 01:29:26 2006 +0000 @@ -15,7 +15,7 @@ * */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/XCrAssoc.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/XCrAssoc.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,5 @@ /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/XDelAssoc.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/XDelAssoc.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,5 @@ /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/XDestAssoc.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/XDestAssoc.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,5 @@ /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/XLookAssoc.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/XLookAssoc.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,5 @@ /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/XMakeAssoc.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/XMakeAssoc.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,5 @@ /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/XMenu.h Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/XMenu.h Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ #include "copyright.h" /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/XMenuInt.h Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/XMenuInt.h Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,5 @@ /* Copyright Massachusetts Institute of Technology 1985 */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /*
--- a/oldXMenu/copyright.h Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/copyright.h Sat Dec 16 01:29:26 2006 +0000 @@ -16,7 +16,7 @@ */ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /* arch-tag: c689b1bc-a3ba-41a1-baa0-a3622b5445b2
--- a/oldXMenu/insque.c Fri Dec 15 01:34:17 2006 +0000 +++ b/oldXMenu/insque.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005, +/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. */ /* This file implements the emacs_insque and emacs_remque functions,
--- a/src/ChangeLog Fri Dec 15 01:34:17 2006 +0000 +++ b/src/ChangeLog Sat Dec 16 01:29:26 2006 +0000 @@ -1,3 +1,144 @@ +2006-12-15 Eli Zaretskii <eliz@gnu.org> + + * emacs.c (USAGE3): Clarify documentation of --color. + +2006-12-15 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * mac.c (wakeup_from_rne_enabled_p) [TARGET_API_MAC_CARBON]: New + variable. + (ENABLE_WAKEUP_FROM_RNE, DISABLE_WAKEUP_FROM_RNE): New macros. + [!MAC_OSX] (select): Use them. + [MAC_OSX] (select_and_poll_event, sys_select): Likewise. + (mac_wakeup_from_rne) [TARGET_API_MAC_CARBON]: New function. + + * macfns.c (mac_atsu_font_face_attributes) [USE_ATSUI]: Add extern. + (Fmac_atsu_font_face_attributes) [USE_ATSUI]: New function. + (syms_of_macfns) [USE_ATSUI]: Defsubr it. + + * macselect.c [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Use + mac_wakeup_from_rne instead of mac_post_mouse_moved_event. + + * macterm.c (mac_query_char_extents) [USE_ATSUI]: Don't call + ATSUGetGlyphBounds if not necessary. + (Vmac_atsu_font_table) [USE_ATSUI]: Remove Variable. + (syms_of_macterm) [USE_ATSUI]: Don't defvar it. + (fm_get_style_from_font, atsu_find_font_from_family_name) + (atsu_find_font_family_name, mac_atsu_font_face_attributes) + [USE_ATSUI]: New functions. + (init_font_name_table) [USE_ATSUI]: Use atsu_find_font_family_name. + (mac_load_query_font) [USE_ATSUI]: Use atsu_find_font_from_family_name. + Don't get metrics for Latin-1 right half characters. + (mac_load_query_font): Don't load font if space width is not positive. + [TARGET_API_MAC_CARBON] (mac_store_event_ref_as_apple_event): Use + mac_wakeup_from_rne instead of mac_post_mouse_moved_event. + (XTread_socket): Call SelectWindow when unfocused frame is clicked. + + * macterm.h (mac_wakeup_from_rne) [TARGET_API_MAC_CARBON]: Add extern. + +2006-12-15 Kim F. Storm <storm@cua.dk> + + * keyboard.c (ignore_mouse_drag_p): New global var. + (some_mouse_moved): Return 0 if it is non-zero. + (make_lispy_event): Generate click event on mouse up if + ignore_mouse_drag_p is non-zero, even if mouse moved. + Clear ignore_mouse_drag_p on mouse down/up. + + * xdisp.c (redisplay_window): Set ignore_mouse_drag_p if tool-bar + is resized to avoid generating a mouse drag event. + +2006-12-14 Juanma Barranquero <lekktu@gmail.com> + + * w32fns.c (w32_wnd_proc): Force non-tooltip frames to respect the + minimum tracking size. Remove non-working old hack to do the same. + +2006-12-14 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * emacs.c (handle_user_signal): Move function to keyboard.c. + (main): Use add_user_signal for SIGUSR1 and SIGUSR2. + + * keyboard.c (make_lispy_event): Use find_user_signal_name. + (read_avail_input): Store pending user signal events. + (struct user_signal_info): New struct. + (user_signals): New variable. + (add_user_signal, store_user_signal_events) + (find_user_signal_name): New functions. + (handle_user_signal): Move function from emacs.c. Don't store + USER_SIGNAL_EVENT here, but increment number of pending signals. + + * keyboard.h (add_user_signals): Add extern. + +2006-12-11 Juanma Barranquero <lekktu@gmail.com> + + * buffer.c (syms_of_buffer) <cursor-in-non-selected-windows>: + <default-scroll-up-aggressively, default-scroll-down-aggressively>: + <line-spacing, left-margin>: Doc fixes. + + * xdisp.c (syms_of_xdisp) <mode-line-inverse-video>: Doc fix. + +2006-12-10 Kim F. Storm <storm@cua.dk> + + * xdisp.c (show_mouse_face): Never use text cursor in tool-bar. + +2006-12-10 Juanma Barranquero <lekktu@gmail.com> + + * abbrev.c (syms_of_abbrev) <last-abbrev-text>: + * buffer.c (syms_of_buffer) <default-major-mode>: + * keymap.c (Flookup_key): + * lread.c (Feval_buffer, Feval_region): + * macterm.c (syms_of_macterm) <x-use-underline-position-properties>: + <x-underline-at-descent-line, mac-emulate-three-button-mouse>: + * marker.c (Fmarker_insertion_type): + * minibuf.c (syms_of_minibuf) <minibuffer-completion-table>: + * msdos.c (syms_of_msdos) <delete-exited-processes>: + * w32term.c (syms_of_w32term) <x-use-underline-position-properties>: + <x-underline-at-descent-line>: + * xdisp.c (format-mode-line): + * xterm.c (syms_of_xterm) <x-use-underline-position-properties>: + <x-underline-at-descent-line>: Doc fixes. + +2006-12-10 Andreas Schwab <schwab@suse.de> + + * systime.h (EMACS_GET_TIME): Remove check for + HAVE_STRUCT_TIMEZONE which is never defined. + +2006-12-10 Alan Mackenzie <acm@muc.de> + + * syntax.c (Fpartial_parse_sexp): Correct Docco: Elt 8 of the + result is now neither the last elt nor optional for OLDSTATE. + +2006-12-09 Eli Zaretskii <eliz@gnu.org> + + * process.c (Fsignal_process): Doc fix. Use XFLOAT_DATA to + extract the process ID from a Lisp float. + +2006-12-09 Chong Yidong <cyd@stupidchicken.com> + + * xterm.c (XTframe_raise_lower): Comment out _NET_ACTIVE_WINDOW code. + +2006-12-08 Eli Zaretskii <eliz@gnu.org> + + * frame.h (PIX_TYPE): Redefine as `unsigned long', for 64-bit + platforms where long is 64-bit. + + * msdos.h (PIX_TYPE): Redefine as `unsigned long'. + +2006-12-08 NAKAJI Hiroyuki <nakaji@jp.freebsd.org> (tiny change) + + * m/amdx86-64.h: Add support for Solaris 10 on x86-64. + +2006-12-08 Kenichi Handa <handa@m17n.org> + + * xterm.c (x_query_font): Use xstricmp instead off strcasecmp. + +2006-12-08 Juanma Barranquero <lekktu@gmail.com> + + * emacs.c (syms_of_emacs) <system-type>: Doc fix. + +2006-12-07 Kim F. Storm <storm@cua.dk> + + * process.c (parse_signal): Use xstricmp instead of strcasecmp. + (Fsignal_process): Don't use strncasecmp. + 2006-12-05 Glenn Morris <rgm@gnu.org> * abbrev.c (Qforce): New Lisp_Object.
--- a/src/abbrev.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/abbrev.c Sat Dec 16 01:29:26 2006 +0000 @@ -685,7 +685,7 @@ DEFVAR_LISP ("last-abbrev-text", &Vlast_abbrev_text, doc: /* The exact text of the last abbrev expanded. -nil if the abbrev has already been unexpanded. */); +A value of nil means the abbrev has already been unexpanded. */); DEFVAR_INT ("last-abbrev-location", &last_abbrev_point, doc: /* The location of the start of the last abbrev expanded. */);
--- a/src/buffer.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/buffer.c Sat Dec 16 01:29:26 2006 +0000 @@ -5447,13 +5447,13 @@ &buffer_defaults.scroll_up_aggressively, doc: /* Default value of `scroll-up-aggressively'. This value applies in buffers that don't have their own local values. -This variable is an alias for (default-value 'scroll-up-aggressively). */); +This is the same as (default-value 'scroll-up-aggressively). */); DEFVAR_LISP_NOPRO ("default-scroll-down-aggressively", &buffer_defaults.scroll_down_aggressively, doc: /* Default value of `scroll-down-aggressively'. This value applies in buffers that don't have their own local values. -This variable is an alias for (default-value 'scroll-down-aggressively). */); +This is the same as (default-value 'scroll-down-aggressively). */); DEFVAR_PER_BUFFER ("header-line-format", ¤t_buffer->header_line_format, @@ -5516,8 +5516,8 @@ DEFVAR_LISP_NOPRO ("default-major-mode", &buffer_defaults.major_mode, doc: /* *Major mode for new buffers. Defaults to `fundamental-mode'. -nil here means use current buffer's major mode, provided it is not -marked as "special". +A value of nil means use current buffer's major mode, +provided it is not marked as "special". When a mode is used by default, `find-file' switches to it before it reads the contents into the buffer and before @@ -5547,7 +5547,7 @@ DEFVAR_PER_BUFFER ("left-margin", ¤t_buffer->left_margin, make_number (Lisp_Int), - doc: /* *Column for the default indent-line-function to indent to. + doc: /* *Column for the default `indent-line-function' to indent to. Linefeed indents to this column in Fundamental mode. */); DEFVAR_PER_BUFFER ("tab-width", ¤t_buffer->tab_width, @@ -6052,12 +6052,12 @@ doc: /* Additional space to put between lines when displaying a buffer. The space is measured in pixels, and put below lines on window systems. If value is a floating point number, it specifies the spacing relative -to the default frame line height. nil means add no extra space. */); +to the default frame line height. A value of nil means add no extra space. */); DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows", ¤t_buffer->cursor_in_non_selected_windows, Qnil, doc: /* *Cursor type to display in non-selected windows. -t means to use hollow box cursor. See `cursor-type' for other values. */); +The value t means to use hollow box cursor. See `cursor-type' for other values. */); DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions, doc: /* List of functions called with no args to query before killing a buffer. */);
--- a/src/category.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/category.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ /* GNU Emacs routines to deal with category tables. Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 1999 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003
--- a/src/category.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/category.h Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ /* Declarations having to do with Emacs category tables. - Copyright (C) 1995, 1998, 1999 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003
--- a/src/ccl.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/ccl.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ /* CCL (Code Conversion Language) interpreter. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003
--- a/src/ccl.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/ccl.h Sat Dec 16 01:29:26 2006 +0000 @@ -1,5 +1,6 @@ /* Header for CCL (Code Conversion Language) interpreter. - Copyright (C) 1995, 1998, 2000 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003
--- a/src/charset.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/charset.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ /* Basic character set support. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003, 2004
--- a/src/charset.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/charset.h Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ /* Header for charset handler. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 2003 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003
--- a/src/coding.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/coding.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ /* Coding system handler (conversion, detection, etc). Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 2002, 2003, 2004, 2005 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003
--- a/src/coding.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/coding.h Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ /* Header for coding system handler. Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 2000 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003
--- a/src/composite.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/composite.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ /* Composite sequence support. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1999 + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003, 2006
--- a/src/composite.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/composite.h Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,7 @@ /* Header for composite sequence handler. Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1997 + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003, 2006
--- a/src/emacs.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/emacs.c Sat Dec 16 01:29:26 2006 +0000 @@ -303,7 +303,7 @@ used for debugging Emacs\n\ --border-color, -bd COLOR main border color\n\ --border-width, -bw WIDTH width of main border\n\ ---color, --color=MODE color mode for character terminals;\n\ +--color, --color=MODE override color mode for character terminals;\n\ MODE defaults to `auto', and can also\n\ be `never', `auto', `always',\n\ or a mode name like `ansi8'\n\ @@ -361,24 +361,6 @@ #endif -#if defined (SIGUSR1) || defined (SIGUSR2) -SIGTYPE -handle_user_signal (sig) - int sig; -{ - struct input_event buf; - - SIGNAL_THREAD_CHECK (sig); - bzero (&buf, sizeof buf); - buf.kind = USER_SIGNAL_EVENT; - buf.frame_or_window = selected_frame; - - kbd_buffer_store_event (&buf); - buf.code = sig; - kbd_buffer_store_event (&buf); -} -#endif - /* Handle bus errors, invalid instruction, etc. */ SIGTYPE fatal_error_signal (sig) @@ -1214,10 +1196,10 @@ signal (SIGILL, fatal_error_signal); signal (SIGTRAP, fatal_error_signal); #ifdef SIGUSR1 - signal (SIGUSR1, handle_user_signal); + add_user_signal (SIGUSR1, "usr1"); #endif #ifdef SIGUSR2 - signal (SIGUSR2, handle_user_signal); + add_user_signal (SIGUSR2, "usr2"); #endif #ifdef SIGABRT signal (SIGABRT, fatal_error_signal); @@ -2478,7 +2460,8 @@ `ms-dos' compiled as an MS-DOS application. `windows-nt' compiled as a native W32 application. `cygwin' compiled using the Cygwin library. - `vax-vms' or `axp-vms': compiled for a (Open)VMS system. + `vax-vms' or + `axp-vms' compiled for a (Open)VMS system. Anything else indicates some sort of Unix system. */); Vsystem_type = intern (SYSTEM_TYPE);
--- a/src/fontset.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/fontset.c Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,7 @@ /* Fontset handler. Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 1998, 2000, 2003, 2004, 2005 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003, 2006
--- a/src/fontset.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/fontset.h Sat Dec 16 01:29:26 2006 +0000 @@ -1,7 +1,8 @@ /* Header for fontset handler. Copyright (C) 1998, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. - Copyright (C) 1995, 1997, 2000 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H14PRO021 Copyright (C) 2003, 2006
--- a/src/frame.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/frame.h Sat Dec 16 01:29:26 2006 +0000 @@ -72,7 +72,7 @@ #if !defined(HAVE_X_WINDOWS) -#define PIX_TYPE int +#define PIX_TYPE unsigned long /* A (mostly empty) x_output structure definition for building Emacs on Unix and GNU/Linux without X support. */
--- a/src/keyboard.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/keyboard.c Sat Dec 16 01:29:26 2006 +0000 @@ -699,6 +699,9 @@ static void timer_start_idle P_ ((void)); static void timer_stop_idle P_ ((void)); static void timer_resume_idle P_ ((void)); +static SIGTYPE handle_user_signal P_ ((int)); +static char *find_user_signal_name P_ ((int)); +static int store_user_signal_events P_ ((void)); /* Nonzero means don't try to suspend even if the operating system seems to support it. */ @@ -1435,13 +1438,25 @@ } /* If mouse has moved on some frame, return one of those frames. - Return 0 otherwise. */ + + Return 0 otherwise. + + If ignore_mouse_drag_p is non-zero, ignore (implicit) mouse movement + after resizing the tool-bar window. */ + +int ignore_mouse_drag_p; static FRAME_PTR some_mouse_moved () { Lisp_Object tail, frame; + if (ignore_mouse_drag_p) + { + //ignore_mouse_drag_p = 0; + return 0; + } + FOR_EACH_FRAME (tail, frame) { if (XFRAME (frame)->mouse_moved) @@ -5589,6 +5604,7 @@ double_click_count = 1; button_down_time = event->timestamp; *start_pos_ptr = Fcopy_alist (position); + ignore_mouse_drag_p = 0; } /* Now we're releasing a button - check the co-ordinates to @@ -5624,8 +5640,13 @@ ydiff = XINT (event->y) - XINT (XCDR (down)); } - if (xdiff < double_click_fuzz && xdiff > - double_click_fuzz - && ydiff < double_click_fuzz && ydiff > - double_click_fuzz + if (ignore_mouse_drag_p) + { + event->modifiers |= click_modifier; + ignore_mouse_drag_p = 0; + } + else if (xdiff < double_click_fuzz && xdiff > - double_click_fuzz + && ydiff < double_click_fuzz && ydiff > - double_click_fuzz /* Maybe the mouse has moved a lot, caused scrolling, and eventually ended up at the same screen position (but not buffer position) in which case it is a drag, not @@ -5948,20 +5969,16 @@ case USER_SIGNAL_EVENT: /* A user signal. */ - switch (event->code) - { - case 0: - return Qsignal; -#ifdef SIGUSR1 - case SIGUSR1: - return intern ("usr1"); -#endif -#ifdef SIGUSR2 - case SIGUSR2: - return intern ("usr2"); -#endif - default: - return make_number (event->code); + if (event->code == 0) + return Qsignal; + else + { + char *name = find_user_signal_name (event->code); + + if (name) + return intern (name); + else + return make_number (event->code); } case SAVE_SESSION_EVENT: @@ -6799,6 +6816,10 @@ register int i; int nread = 0; + /* Store pending user signal events, if any. */ + if (store_user_signal_events ()) + expected = 0; + if (read_socket_hook) { int nr; @@ -7022,6 +7043,133 @@ +/* User signal events. */ + +struct user_signal_info +{ + /* Signal number. */ + int sig; + + /* Name of the signal. */ + char *name; + + /* Number of pending signals. */ + int npending; + + struct user_signal_info *next; +}; + +/* List of user signals. */ +static struct user_signal_info *user_signals = NULL; + +void +add_user_signal (sig, name) + int sig; + const char *name; +{ + struct user_signal_info *p; + + for (p = user_signals; p; p = p->next) + if (p->sig == sig) + /* Already added. */ + return; + + p = xmalloc (sizeof (struct user_signal_info)); + p->sig = sig; + p->name = xstrdup (name); + p->npending = 0; + p->next = user_signals; + user_signals = p; + + signal (sig, handle_user_signal); +} + +static SIGTYPE +handle_user_signal (sig) + int sig; +{ + int old_errno = errno; + struct user_signal_info *p; + +#if defined (USG) && !defined (POSIX_SIGNALS) + /* USG systems forget handlers when they are used; + must reestablish each time */ + signal (sig, handle_user_signal); +#endif + + SIGNAL_THREAD_CHECK (sig); + + for (p = user_signals; p; p = p->next) + if (p->sig == sig) + { + p->npending++; +#ifdef SIGIO + if (interrupt_input) + kill (getpid (), SIGIO); + else +#endif + { + /* Tell wait_reading_process_output that it needs to wake + up and look around. */ + if (input_available_clear_time) + EMACS_SET_SECS_USECS (*input_available_clear_time, 0, 0); + } + break; + } + + errno = old_errno; +} + +static char * +find_user_signal_name (sig) + int sig; +{ + struct user_signal_info *p; + + for (p = user_signals; p; p = p->next) + if (p->sig == sig) + return p->name; + + return NULL; +} + +static int +store_user_signal_events () +{ + struct user_signal_info *p; + struct input_event buf; + int nstored = 0; + + for (p = user_signals; p; p = p->next) + if (p->npending > 0) + { + SIGMASKTYPE mask; + + if (nstored == 0) + { + bzero (&buf, sizeof buf); + buf.kind = USER_SIGNAL_EVENT; + buf.frame_or_window = selected_frame; + } + nstored += p->npending; + + mask = sigblock (sigmask (p->sig)); + do + { + buf.code = 0; + kbd_buffer_store_event (&buf); + buf.code = p->sig; + kbd_buffer_store_event (&buf); + p->npending--; + } + while (p->npending > 0); + sigsetmask (mask); + } + + return nstored; +} + + static void menu_bar_item P_ ((Lisp_Object, Lisp_Object, Lisp_Object, void*)); static Lisp_Object menu_bar_one_keymap_changed_items;
--- a/src/keyboard.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/keyboard.h Sat Dec 16 01:29:26 2006 +0000 @@ -344,6 +344,7 @@ extern void kbd_buffer_store_help_event P_ ((Lisp_Object, Lisp_Object)); extern Lisp_Object menu_item_eval_property P_ ((Lisp_Object)); extern int kbd_buffer_events_waiting P_ ((int)); +extern void add_user_signals P_ ((int, const char *)); /* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3 (do not change this comment) */
--- a/src/keymap.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/keymap.c Sat Dec 16 01:29:26 2006 +0000 @@ -1280,7 +1280,8 @@ DEFUN ("lookup-key", Flookup_key, Slookup_key, 2, 3, 0, doc: /* In keymap KEYMAP, look up key sequence KEY. Return the definition. -nil means undefined. See doc of `define-key' for kinds of definitions. +A value of nil means undefined. See doc of `define-key' +for kinds of definitions. A number as value means KEY is "too long"; that is, characters or symbols in it except for the last one @@ -1655,13 +1656,13 @@ are read using the keymaps of the buffer clicked on, not the current buffer. So we may have to switch the buffer here. */ - + if (CONSP (position)) { Lisp_Object window; - + window = POSN_WINDOW (position); - + if (WINDOWP (window) && BUFFERP (XWINDOW (window)->buffer) && XBUFFER (XWINDOW (window)->buffer) != current_buffer) @@ -1673,13 +1674,13 @@ would not be a problem here, but it is easier to keep things the same. */ - + record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); - + set_buffer_internal (XBUFFER (XWINDOW (window)->buffer)); } } - + if (! NILP (current_kboard->Voverriding_terminal_local_map)) { value = Flookup_key (current_kboard->Voverriding_terminal_local_map, @@ -1702,8 +1703,8 @@ : MARKERP (position) ? marker_position (position) : PT; - local_map = get_local_map (pt, current_buffer, Qlocal_map); - keymap = get_local_map (pt, current_buffer, Qkeymap); + local_map = get_local_map (pt, current_buffer, Qlocal_map); + keymap = get_local_map (pt, current_buffer, Qkeymap); if (CONSP (position)) { @@ -1711,7 +1712,7 @@ /* For a mouse click, get the local text-property keymap of the place clicked on, rather than point. */ - + if (POSN_INBUFFER_P (position)) { Lisp_Object pos; @@ -1722,7 +1723,7 @@ { local_map = get_local_map (XINT (pos), current_buffer, Qlocal_map); - + keymap = get_local_map (XINT (pos), current_buffer, Qkeymap); } @@ -1733,12 +1734,12 @@ string displayed via the `display' property, consider `local-map' and `keymap' properties of that string. */ - + if (string = POSN_STRING (position), (CONSP (string) && STRINGP (XCAR (string)))) { Lisp_Object pos, map; - + pos = XCDR (string); string = XCAR (string); if (INTEGERP (pos) @@ -1754,7 +1755,7 @@ keymap = map; } } - + } if (! NILP (keymap))
--- a/src/lread.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/lread.c Sat Dec 16 01:29:26 2006 +0000 @@ -656,7 +656,7 @@ { EMACS_TIME wait_time; int sec, usec; - double duration = extract_float (seconds); + double duration = extract_float (seconds); sec = (int) duration; usec = (duration - sec) * 1000000; @@ -1743,7 +1743,7 @@ Programs can pass two arguments, BUFFER and PRINTFLAG. BUFFER is the buffer to evaluate (nil means use current buffer). PRINTFLAG controls printing of output: -nil means discard it; anything else is stream for print. +A value of nil means discard it; anything else is stream for print. If the optional third argument FILENAME is non-nil, it specifies the file name to use for `load-history'. @@ -1792,7 +1792,7 @@ giving starting and ending indices in the current buffer of the text to be executed. Programs can pass third argument PRINTFLAG which controls output: -nil means discard it; anything else is stream for printing it. +A value of nil means discard it; anything else is stream for printing it. Also the fourth argument READ-FUNCTION, if non-nil, is used instead of `read' to read each expression. It gets one argument which is the input stream for reading characters.
--- a/src/m/amdx86-64.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/m/amdx86-64.h Sat Dec 16 01:29:26 2006 +0000 @@ -125,7 +125,12 @@ #undef LIB_STANDARD #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o -#else /* !__OpenBSD__ && !__FreeBSD__ */ +#elif defined(sun) + +#undef START_FILES +#undef LIB_STANDARD + +#else /* !__OpenBSD__ && !__FreeBSD__ && !sun */ #undef START_FILES #ifdef HAVE_X86_64_LIB64_DIR
--- a/src/mac.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/mac.c Sat Dec 16 01:29:26 2006 +0000 @@ -79,6 +79,15 @@ /* The single script context used for all script executions. */ static OSAID as_script_context; +#if TARGET_API_MAC_CARBON +static int wakeup_from_rne_enabled_p = 0; +#define ENABLE_WAKEUP_FROM_RNE (wakeup_from_rne_enabled_p = 1) +#define DISABLE_WAKEUP_FROM_RNE (wakeup_from_rne_enabled_p = 0) +#else +#define ENABLE_WAKEUP_FROM_RNE 0 +#define DISABLE_WAKEUP_FROM_RNE 0 +#endif + #ifndef MAC_OSX static OSErr posix_pathname_to_fsspec P_ ((const char *, FSSpec *)); static OSErr fsspec_to_posix_pathname P_ ((const FSSpec *, char *, int)); @@ -2431,6 +2440,7 @@ BLOCK_INPUT block, in case that some input has already been read asynchronously. */ BLOCK_INPUT; + ENABLE_WAKEUP_FROM_RNE; if (!detect_input_pending ()) { #if TARGET_API_MAC_CARBON @@ -2461,6 +2471,7 @@ } #endif /* not TARGET_API_MAC_CARBON */ } + DISABLE_WAKEUP_FROM_RNE; UNBLOCK_INPUT; if (err == noErr) @@ -5023,6 +5034,7 @@ BLOCK_INPUT block, in case that some input has already been read asynchronously. */ BLOCK_INPUT; + ENABLE_WAKEUP_FROM_RNE; if (!detect_input_pending ()) { EMACS_TIME select_timeout; @@ -5045,6 +5057,7 @@ kEventLeaveInQueue, NULL); } } + DISABLE_WAKEUP_FROM_RNE; UNBLOCK_INPUT; if (r != 0) @@ -5124,6 +5137,7 @@ BLOCK_INPUT block, in case that some input has already been read asynchronously. */ BLOCK_INPUT; + ENABLE_WAKEUP_FROM_RNE; if (!detect_input_pending ()) { int minfd, fd; @@ -5184,6 +5198,7 @@ CFRunLoopRemoveSource (runloop, source, kCFRunLoopDefaultMode); } } + DISABLE_WAKEUP_FROM_RNE; UNBLOCK_INPUT; if (err == noErr || err == eventLoopQuitErr) @@ -5385,6 +5400,16 @@ } #endif /* MAC_OSX */ +#if TARGET_API_MAC_CARBON +void +mac_wakeup_from_rne () +{ + if (wakeup_from_rne_enabled_p) + /* Post a harmless event so as to wake up from + ReceiveNextEvent. */ + mac_post_mouse_moved_event (); +} +#endif void syms_of_mac ()
--- a/src/macfns.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/macfns.c Sat Dec 16 01:29:26 2006 +0000 @@ -4597,6 +4597,30 @@ return Qnil; } #endif + +#if USE_ATSUI +extern Lisp_Object mac_atsu_font_face_attributes P_ ((ATSUFontID)); + +DEFUN ("mac-atsu-font-face-attributes", Fmac_atsu_font_face_attributes, + Smac_atsu_font_face_attributes, 1, 1, 0, + doc: /* Return plist of face attributes and values for ATSU font ID. +ID is specified by either an integer or a float. */) + (id) + Lisp_Object id; +{ + ATSUFontID font_id; + Lisp_Object result; + + check_mac (); + CHECK_NUMBER_OR_FLOAT(id); + font_id = NUMBERP (id) ? XINT (id) : (ATSUFontID) XFLOAT (id); + BLOCK_INPUT; + result = mac_atsu_font_face_attributes (font_id); + UNBLOCK_INPUT; + return result; +} +#endif + /*********************************************************************** Initialization @@ -4829,6 +4853,9 @@ #if USE_MAC_FONT_PANEL defsubr (&Smac_set_font_panel_visibility); #endif +#if USE_ATSUI + defsubr (&Smac_atsu_font_face_attributes); +#endif } /* arch-tag: d7591289-f374-4377-b245-12f5dbbb8edc
--- a/src/macselect.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/macselect.c Sat Dec 16 01:29:26 2006 +0000 @@ -1567,8 +1567,7 @@ { mac_store_drag_event (window, mouse_pos, modifiers, &apple_event); AEDisposeDesc (&apple_event); - /* Post a harmless event so as to wake up from ReceiveNextEvent. */ - mac_post_mouse_moved_event (); + mac_wakeup_from_rne (); return noErr; } else
--- a/src/macterm.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/macterm.c Sat Dec 16 01:29:26 2006 +0000 @@ -1156,7 +1156,8 @@ UniChar ch = c; err = atsu_get_text_layout_with_text_ptr (&ch, 1, style, &text_layout); - if (err == noErr) + if (err == noErr + && (font_ascent_return || font_descent_return || overall_return)) { ATSTrapezoid glyph_bounds; @@ -7006,7 +7007,6 @@ static Lisp_Object atsu_font_id_hash; /* Alist linking Font Manager style to face attributes. */ static Lisp_Object fm_style_face_attributes_alist; -static Lisp_Object Vmac_atsu_font_table; extern Lisp_Object QCfamily, QCweight, QCslant, Qnormal, Qbold, Qitalic; #endif @@ -7243,6 +7243,73 @@ } #if USE_ATSUI +static FMFontStyle +fm_get_style_from_font (font) + FMFont font; +{ + OSStatus err; + FMFontStyle style = normal; + ByteCount len; + UInt16 mac_style; + FMFontFamily font_family; +#define FONT_HEADER_MAC_STYLE_OFFSET (4*4 + 2*2 + 8*2 + 2*4) + + /* FMGetFontFamilyInstanceFromFont returns `normal' as the style of + some font (e.g., Optima) even if it is `bold'. */ + err = FMGetFontTable (font, 'head', FONT_HEADER_MAC_STYLE_OFFSET, + sizeof (mac_style), &mac_style, &len); + if (err == noErr + && len >= FONT_HEADER_MAC_STYLE_OFFSET + sizeof (mac_style)) + style = EndianU16_BtoN (mac_style); + else + FMGetFontFamilyInstanceFromFont (font, &font_family, &style); + + return style; +} + +static ATSUFontID +atsu_find_font_from_family_name (family) + const char *family; +{ + struct Lisp_Hash_Table *h = XHASH_TABLE (atsu_font_id_hash); + unsigned hash_code; + int i; + Lisp_Object rest, best; + FMFontStyle min_style, style; + + i = hash_lookup (h, make_unibyte_string (family, strlen (family)), + &hash_code); + if (i < 0) + return kATSUInvalidFontID; + + rest = HASH_VALUE (h, i); + if (INTEGERP (rest) || (CONSP (rest) && INTEGERP (XCDR (rest)))) + return cons_to_long (rest); + + rest = Fnreverse (rest); + best = XCAR (rest); + rest = XCDR (rest); + if (!NILP (rest) + && (min_style = fm_get_style_from_font (cons_to_long (best))) != normal) + do + { + style = fm_get_style_from_font (cons_to_long (XCAR (rest))); + if (style < min_style) + { + best = XCAR (rest); + if (style == normal) + break; + else + min_style = style; + } + rest = XCDR (rest); + } + while (!NILP (rest)); + + HASH_VALUE (h, i) = best; + return cons_to_long (best); +} + static Lisp_Object fm_style_to_face_attributes (fm_style) FMFontStyle fm_style; @@ -7263,6 +7330,44 @@ return tem; } + +static Lisp_Object +atsu_find_font_family_name (font_id) + ATSUFontID font_id; +{ + OSStatus err; + ByteCount len; + Lisp_Object family = Qnil; + + err = ATSUFindFontName (font_id, kFontFamilyName, + kFontMacintoshPlatform, kFontNoScript, + kFontNoLanguage, 0, NULL, &len, NULL); + if (err == noErr) + { + family = make_uninit_string (len); + err = ATSUFindFontName (font_id, kFontFamilyName, + kFontMacintoshPlatform, kFontNoScript, + kFontNoLanguage, len, SDATA (family), + NULL, NULL); + } + if (err == noErr) + decode_mac_font_name (SDATA (family), len + 1, Qnil); + + return family; +} + +Lisp_Object +mac_atsu_font_face_attributes (font_id) + ATSUFontID font_id; +{ + Lisp_Object family, style_attrs; + + family = atsu_find_font_family_name (font_id); + if (NILP (family)) + return Qnil; + style_attrs = fm_style_to_face_attributes (fm_get_style_from_font (font_id)); + return Fcons (QCfamily, Fcons (family, style_attrs)); +} #endif /* Sets up the table font_name_table to contain the list of all fonts @@ -7294,9 +7399,8 @@ unsigned hash_code; ItemCount nfonts, i; ATSUFontID *font_ids = NULL; - Ptr name; - ByteCount name_len; - Lisp_Object family; + Lisp_Object prev_family = Qnil; + int j; atsu_font_id_hash = make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE), @@ -7314,41 +7418,25 @@ if (err == noErr) for (i = 0; i < nfonts; i++) { - err = ATSUFindFontName (font_ids[i], kFontFamilyName, - kFontMacintoshPlatform, kFontNoScript, - kFontNoLanguage, 0, NULL, &name_len, NULL); - if (err != noErr) + Lisp_Object family; + + family = atsu_find_font_family_name (font_ids[i]); + if (NILP (family) || SREF (family, 0) == '.') continue; - name = xmalloc (name_len + 1); - name[name_len] = '\0'; - err = ATSUFindFontName (font_ids[i], kFontFamilyName, - kFontMacintoshPlatform, kFontNoScript, - kFontNoLanguage, name_len, name, - NULL, NULL); - if (err == noErr) + if (!NILP (Fequal (prev_family, family))) + family = prev_family; + else + j = hash_lookup (h, family, &hash_code); + if (j < 0) { - FMFontFamily ff; - FMFontStyle style = normal; - - decode_mac_font_name (name, name_len + 1, Qnil); - family = make_unibyte_string (name, name_len); - FMGetFontFamilyInstanceFromFont (font_ids[i], &ff, &style); - Fputhash ((font_ids[i] > MOST_POSITIVE_FIXNUM - ? make_float (font_ids[i]) - : make_number (font_ids[i])), - Fcons (QCfamily, - Fcons (family, - fm_style_to_face_attributes (style))), - Vmac_atsu_font_table); - if (*name != '.' - && hash_lookup (h, family, &hash_code) < 0) - { - add_mac_font_name (name, 0, normal, "iso10646-1"); - hash_put (h, family, long_to_cons (font_ids[i]), - hash_code); - } + add_mac_font_name (SDATA (family), 0, normal, "iso10646-1"); + j = hash_put (h, family, Fcons (long_to_cons (font_ids[i]), + Qnil), hash_code); } - xfree (name); + else if (EQ (prev_family, family)) + HASH_VALUE (h, j) = Fcons (long_to_cons (font_ids[i]), + HASH_VALUE (h, j)); + prev_family = family; } if (font_ids) xfree (font_ids); @@ -7892,14 +7980,11 @@ {kAllTypographicFeaturesType, kDiacriticsType}; static const ATSUFontFeatureSelector selectors[] = {kAllTypeFeaturesOffSelector, kDecomposeDiacriticsSelector}; - Lisp_Object font_id_cons; FMFontStyle style; - font_id_cons = Fgethash (make_unibyte_string (family, strlen (family)), - atsu_font_id_hash, Qnil); - if (NILP (font_id_cons)) - return NULL; - font_id = cons_to_long (font_id_cons); + font_id = atsu_find_font_from_family_name (family); + if (font_id == kATSUInvalidFontID) + return; size_fixed = Long2Fix (size); bold_p = (fontface & bold) != 0; italic_p = (fontface & italic) != 0; @@ -8023,11 +8108,19 @@ continue; else if (c == 0x7f) { - c = 0x9f; - continue; +#if USE_CG_TEXT_DRAWING + if (font->cg_glyphs) + { + c = 0x9f; + pcm = NULL; + continue; + } +#endif + break; } - mac_query_char_extents (font->mac_style, c, NULL, NULL, pcm + c, + mac_query_char_extents (font->mac_style, c, NULL, NULL, + pcm ? pcm + c : NULL, #if USE_CG_TEXT_DRAWING (font->cg_glyphs ? font->cg_glyphs + c : NULL) @@ -8045,6 +8138,8 @@ font->cg_font = NULL; xfree (font->cg_glyphs); font->cg_glyphs = NULL; + if (pcm == NULL) + break; } #endif } @@ -8052,6 +8147,7 @@ else #endif { + OSStatus err; FontInfo the_fontinfo; int is_two_byte_font; @@ -8134,8 +8230,13 @@ sizeof (XCharStruct) * (0xff - 0x20 + 1)); space_bounds = font->bounds.per_char; - mac_query_char_extents (NULL, 0x20, &font->ascent, &font->descent, - space_bounds, NULL); + err = mac_query_char_extents (NULL, 0x20, &font->ascent, + &font->descent, space_bounds, NULL); + if (err != noErr || space_bounds->width <= 0) + { + mac_unload_font (&one_mac_display_info, font); + return NULL; + } for (c = 0x21, pcm = space_bounds + 1; c <= 0xff; c++, pcm++) mac_query_char_extents (NULL, c, NULL, NULL, pcm, NULL); @@ -9386,9 +9487,7 @@ { mac_store_apple_event (class_key, id_key, &apple_event); AEDisposeDesc (&apple_event); - /* Post a harmless event so as to wake up from - ReceiveNextEvent. */ - mac_post_mouse_moved_event (); + mac_wakeup_from_rne (); } } } @@ -10401,7 +10500,9 @@ #else FrontWindow () #endif - != window_ptr) + != window_ptr + || (mac_window_to_frame (window_ptr) + != dpyinfo->x_focus_frame)) SelectWindow (window_ptr); else { @@ -11673,7 +11774,7 @@ DEFVAR_BOOL ("x-use-underline-position-properties", &x_use_underline_position_properties, doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. -nil means ignore them. If you encounter fonts with bogus +A value of nil means ignore them. If you encounter fonts with bogus UNDERLINE_POSITION font properties, for example 7x13 on XFree prior to 4.1, set this to nil. @@ -11683,9 +11784,9 @@ DEFVAR_BOOL ("x-underline-at-descent-line", &x_underline_at_descent_line, doc: /* *Non-nil means to draw the underline at the same place as the descent line. -nil means to draw the underline according to the value of the variable -`x-use-underline-position-properties', which is usually at the baseline -level. The default value is nil. */); +A value of nil means to draw the underline according to the value of the +variable `x-use-underline-position-properties', which is usually at the +baseline level. The default value is nil. */); x_underline_at_descent_line = 0; DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars, @@ -11732,8 +11833,8 @@ &Vmac_emulate_three_button_mouse, doc: /* *Specify a way of three button mouse emulation. The value can be nil, t, or the symbol `reverse'. -nil means that no emulation should be done and the modifiers should be -placed on the mouse-1 event. +A value of nil means that no emulation should be done and the modifiers +should be placed on the mouse-1 event. t means that when the option-key is held down while pressing the mouse button, the click will register as mouse-2 and while the command-key is held down, the click will register as mouse-3. @@ -11784,15 +11885,6 @@ Fcons (list3 (build_string ("mac-roman"), make_number (smRoman), Qnil), Qnil); -#if USE_ATSUI - DEFVAR_LISP ("mac-atsu-font-table", &Vmac_atsu_font_table, - doc: /* Hash table of ATSU font IDs vs plist of attributes and values. */); - Vmac_atsu_font_table = - make_hash_table (Qeql, make_number (DEFAULT_HASH_SIZE), - make_float (DEFAULT_REHASH_SIZE), - make_float (DEFAULT_REHASH_THRESHOLD), - Qnil, Qnil, Qnil); -#endif #if USE_MAC_TSM DEFVAR_LISP ("mac-ts-active-input-overlay", &Vmac_ts_active_input_overlay, doc: /* Overlay used to display Mac TSM active input area. */);
--- a/src/macterm.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/macterm.h Sat Dec 16 01:29:26 2006 +0000 @@ -685,6 +685,7 @@ extern Lisp_Object cfboolean_to_lisp P_ ((CFBooleanRef)); extern Lisp_Object cfobject_desc_to_lisp P_ ((CFTypeRef)); extern Lisp_Object cfproperty_list_to_lisp P_ ((CFPropertyListRef, int, int)); +extern void mac_wakeup_from_rne P_ ((void)); #endif extern void xrm_merge_string_database P_ ((XrmDatabase, const char *)); extern Lisp_Object xrm_get_resource P_ ((XrmDatabase, const char *,
--- a/src/marker.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/marker.c Sat Dec 16 01:29:26 2006 +0000 @@ -848,7 +848,7 @@ DEFUN ("marker-insertion-type", Fmarker_insertion_type, Smarker_insertion_type, 1, 1, 0, doc: /* Return insertion type of MARKER: t if it stays after inserted text. -nil means the marker stays before text inserted there. */) +The value nil means the marker stays before text inserted there. */) (marker) register Lisp_Object marker; {
--- a/src/minibuf.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/minibuf.c Sat Dec 16 01:29:26 2006 +0000 @@ -2868,10 +2868,10 @@ STRING, the current buffer contents; PREDICATE, the predicate for filtering possible matches; CODE, which says what kind of things to do. -CODE can be nil, t or `lambda'. -nil means to return the best completion of STRING, or nil if there is none. -t means to return a list of all possible completions of STRING. -`lambda' means to return t if STRING is a valid completion as it stands. */); +CODE can be nil, t or `lambda': + nil -- return the best completion of STRING, or nil if there is none. + t -- return a list of all possible completions of STRING. + lambda -- return t if STRING is a valid completion as it stands. */); Vminibuffer_completion_table = Qnil; DEFVAR_LISP ("minibuffer-completion-predicate", &Vminibuffer_completion_predicate,
--- a/src/msdos.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/msdos.c Sat Dec 16 01:29:26 2006 +0000 @@ -5300,7 +5300,7 @@ #ifndef subprocesses DEFVAR_BOOL ("delete-exited-processes", &delete_exited_processes, doc: /* *Non-nil means delete processes immediately when they exit. -nil means don't delete them until `list-processes' is run. */); +A value of nil means don't delete them until `list-processes' is run. */); delete_exited_processes = 0; #endif
--- a/src/msdos.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/msdos.h Sat Dec 16 01:29:26 2006 +0000 @@ -53,7 +53,7 @@ typedef int Display; typedef int Window; typedef int XRectangle; -#define PIX_TYPE int +#define PIX_TYPE unsigned long #define XDISPLAY /* A stripped version of struct x_display_info in xterm.h, which see. */
--- a/src/process.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/process.c Sat Dec 16 01:29:26 2006 +0000 @@ -6083,7 +6083,7 @@ DEFUN ("signal-process", Fsignal_process, Ssignal_process, 2, 2, "sProcess (name or number): \nnSignal code: ", doc: /* Send PROCESS the signal with code SIGCODE. -PROCESS may also be an integer specifying the process id of the +PROCESS may also be a number specifying the process id of the process to signal; in this case, the process need not be a child of this Emacs. SIGCODE may be an integer, or a symbol whose name is a signal name. */) @@ -6100,7 +6100,7 @@ if (FLOATP (process)) { - pid = (pid_t) XFLOAT (process); + pid = (pid_t) XFLOAT_DATA (process); goto got_it; } @@ -6129,7 +6129,7 @@ got_it: #define parse_signal(NAME, VALUE) \ - else if (!strcasecmp (name, NAME)) \ + else if (!xstricmp (name, NAME)) \ XSETINT (sigcode, VALUE) if (INTEGERP (sigcode)) @@ -6141,7 +6141,7 @@ CHECK_SYMBOL (sigcode); name = SDATA (SYMBOL_NAME (sigcode)); - if (!strncasecmp(name, "sig", 3)) + if (!strncmp(name, "SIG", 3) || !strncmp(name, "sig", 3)) name += 3; if (0)
--- a/src/syntax.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/syntax.c Sat Dec 16 01:29:26 2006 +0000 @@ -893,7 +893,7 @@ doc: /* Convert a syntax specification STRING into syntax cell form. STRING should be a string as it is allowed as argument of `modify-syntax-entry'. Value is the equivalent cons cell -(CODE . MATCHING-CHAR) that can be used as value of a `syntax-table' +\(CODE . MATCHING-CHAR) that can be used as value of a `syntax-table' text property. */) (string) Lisp_Object string; @@ -3270,7 +3270,7 @@ any character that starts a sexp. Fifth arg OLDSTATE is a list like what this function returns. It is used to initialize the state of the parse. Elements number 1, 2, 6 - and 8 are ignored; you can leave off element 8 (the last) entirely. + and 8 are ignored. Sixth arg COMMENTSTOP non-nil means stop at the start of a comment. If it is symbol `syntax-table', stop after the start of a comment or a string, or after end of a comment or a string. */)
--- a/src/systime.h Fri Dec 15 01:34:17 2006 +0000 +++ b/src/systime.h Sat Dec 16 01:29:26 2006 +0000 @@ -101,16 +101,8 @@ #ifdef GETTIMEOFDAY_ONE_ARGUMENT #define EMACS_GET_TIME(time) gettimeofday (&(time)) #else /* not GETTIMEOFDAY_ONE_ARGUMENT */ -#ifdef HAVE_STRUCT_TIMEZONE -#define EMACS_GET_TIME(time) \ - do { \ - struct timezone dummy; \ - gettimeofday (&(time), &dummy); \ - } while (0) -#else /* Presumably the second arg is ignored. */ #define EMACS_GET_TIME(time) gettimeofday (&(time), NULL) -#endif /* HAVE_STRUCT_TIMEZONE */ #endif /* not GETTIMEOFDAY_ONE_ARGUMENT */ #define EMACS_ADD_TIME(dest, src1, src2) \
--- a/src/w32fns.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/w32fns.c Sat Dec 16 01:29:26 2006 +0000 @@ -3707,8 +3707,11 @@ However for top/left sizing we will need to fix the X and Y positions as well. */ - lppos->cx -= wdiff; - lppos->cy -= hdiff; + int cx_mintrack = GetSystemMetrics (SM_CXMINTRACK); + int cy_mintrack = GetSystemMetrics (SM_CYMINTRACK); + + lppos->cx = max (lppos->cx - wdiff, cx_mintrack); + lppos->cy = max (lppos->cy - hdiff, cy_mintrack); if (wp.showCmd != SW_SHOWMAXIMIZED && (lppos->flags & SWP_NOMOVE) == 0) @@ -3732,9 +3735,6 @@ goto dflt; case WM_GETMINMAXINFO: - /* Hack to correct bug that allows Emacs frames to be resized - below the Minimum Tracking Size. */ - ((LPMINMAXINFO) lParam)->ptMinTrackSize.y++; /* Hack to allow resizing the Emacs frame above the screen size. Note that Windows 9x limits coordinates to 16-bits. */ ((LPMINMAXINFO) lParam)->ptMaxTrackSize.x = 32767;
--- a/src/w32term.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/w32term.c Sat Dec 16 01:29:26 2006 +0000 @@ -6693,7 +6693,7 @@ DEFVAR_BOOL ("x-use-underline-position-properties", &x_use_underline_position_properties, doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. -nil means ignore them. If you encounter fonts with bogus +A value of nil means ignore them. If you encounter fonts with bogus UNDERLINE_POSITION font properties, for example 7x13 on XFree prior to 4.1, set this to nil. @@ -6703,9 +6703,9 @@ DEFVAR_BOOL ("x-underline-at-descent-line", &x_underline_at_descent_line, doc: /* *Non-nil means to draw the underline at the same place as the descent line. -nil means to draw the underline according to the value of the variable -`x-use-underline-position-properties', which is usually at the baseline -level. The default value is nil. */); +A value of nil means to draw the underline according to the value of the +variable `x-use-underline-position-properties', which is usually at the +baseline level. The default value is nil. */); x_underline_at_descent_line = 0; DEFVAR_LISP ("x-toolkit-scroll-bars", &Vx_toolkit_scroll_bars,
--- a/src/xdisp.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/xdisp.c Sat Dec 16 01:29:26 2006 +0000 @@ -13600,8 +13600,11 @@ #endif - if (redisplay_tool_bar_p) - redisplay_tool_bar (f); + if (redisplay_tool_bar_p && redisplay_tool_bar (f)) + { + extern int ignore_mouse_drag_p; + ignore_mouse_drag_p = 1; + } #endif } @@ -17407,9 +17410,9 @@ Optional second arg FACE specifies the face property to put on all characters for which no face is specified. -t means whatever face the window's mode line currently uses +The value t means whatever face the window's mode line currently uses \(either `mode-line' or `mode-line-inactive', depending). -nil means the default is no face property. +A value of nil means the default is no face property. If FACE is an integer, the value string has no text properties. Optional third and fourth args WINDOW and BUFFER specify the window @@ -22155,7 +22158,7 @@ } /* Change the mouse cursor. */ - if (draw == DRAW_NORMAL_TEXT) + if (draw == DRAW_NORMAL_TEXT && !EQ (dpyinfo->mouse_face_window, f->tool_bar_window)) rif->define_frame_cursor (f, FRAME_X_OUTPUT (f)->text_cursor); else if (draw == DRAW_MOUSE_FACE) rif->define_frame_cursor (f, FRAME_X_OUTPUT (f)->hand_cursor); @@ -24276,7 +24279,7 @@ truncate_partial_width_windows = 1; DEFVAR_BOOL ("mode-line-inverse-video", &mode_line_inverse_video, - doc: /* nil means display the mode-line/header-line/menu-bar in the default face. + doc: /* When nil, display the mode-line/header-line/menu-bar in the default face. Any other value means to use the appropriate face, `mode-line', `header-line', or `menu' respectively. */); mode_line_inverse_video = 1;
--- a/src/xterm.c Fri Dec 15 01:34:17 2006 +0000 +++ b/src/xterm.c Sat Dec 16 01:29:26 2006 +0000 @@ -8608,15 +8608,15 @@ Atom *atoms = XListProperties (FRAME_X_DISPLAY (f), FRAME_X_DISPLAY_INFO (f)->root_window, &num); - if (atoms && num > 0) + if (atoms && num > 0) { char **names = (char **) xmalloc (num * sizeof(*names)); - if (XGetAtomNames (FRAME_X_DISPLAY (f), atoms, num, names)) + if (XGetAtomNames (FRAME_X_DISPLAY (f), atoms, num, names)) { int i; - for (i = 0; i < num; ++i) + for (i = 0; i < num; ++i) { - if (!have_net_atom) + if (!have_net_atom) have_net_atom = strncmp (names[i], "_NET_", 5) == 0; XFree (names[i]); } @@ -8629,7 +8629,7 @@ FRAME_X_DISPLAY_INFO (f)->have_net_atoms = have_net_atom; } - if (have_net_atom) + if (have_net_atom) { Lisp_Object frame; const char *atom = "_NET_WM_STATE"; @@ -8642,7 +8642,7 @@ /* If there are _NET_ atoms we assume we have extended window manager hints. */ - switch (f->want_fullscreen) + switch (f->want_fullscreen) { case FULLSCREEN_BOTH: what = fs; @@ -8698,7 +8698,7 @@ XTfullscreen_hook (f) FRAME_PTR f; { - if (f->async_visible) + if (f->async_visible) { BLOCK_INPUT; do_ewmh_fullscreen (f); @@ -8718,7 +8718,7 @@ { int width, height, ign; - if (do_ewmh_fullscreen (f)) + if (do_ewmh_fullscreen (f)) return; x_real_positions (f, &f->left_pos, &f->top_pos); @@ -9052,20 +9052,26 @@ { if (raise_flag) { - Lisp_Object frame; - const char *atom = "_NET_ACTIVE_WINDOW"; + /* The following code is needed for `raise-frame' to work on + some versions of metacity; see Window Manager + Specification/Extended Window Manager Hints at + http://freedesktop.org/wiki/Standards_2fwm_2dspec + + However, on other versions (metacity 2.17.2-1.fc7), it + reportedly causes hangs when resizing frames. */ + + /* Lisp_Object frame; + const char *atom = "_NET_ACTIVE_WINDOW"; */ x_raise_frame (f); - /* See Window Manager Specification/Extended Window Manager Hints at - http://freedesktop.org/wiki/Standards_2fwm_2dspec */ - - XSETFRAME (frame, f); - Fx_send_client_event (frame, make_number (0), frame, + + /* XSETFRAME (frame, f); + Fx_send_client_event (frame, make_number (0), frame, make_unibyte_string (atom, strlen (atom)), make_number (32), Fcons (make_number (1), Fcons (make_number (time (NULL) * 1000), - Qnil))); + Qnil))); */ } else x_lower_frame (f); @@ -10512,8 +10518,8 @@ for (i = 0; i < dpyinfo->n_fonts; i++) if (dpyinfo->font_table[i].name - && (!strcasecmp (dpyinfo->font_table[i].name, fontname) - || !strcasecmp (dpyinfo->font_table[i].full_name, fontname))) + && (!xstricmp (dpyinfo->font_table[i].name, fontname) + || !xstricmp (dpyinfo->font_table[i].full_name, fontname))) return (dpyinfo->font_table + i); return NULL; } @@ -11601,7 +11607,7 @@ DEFVAR_BOOL ("x-use-underline-position-properties", &x_use_underline_position_properties, doc: /* *Non-nil means make use of UNDERLINE_POSITION font properties. -nil means ignore them. If you encounter fonts with bogus +A value of nil means ignore them. If you encounter fonts with bogus UNDERLINE_POSITION font properties, for example 7x13 on XFree prior to 4.1, set this to nil. */); x_use_underline_position_properties = 1; @@ -11609,9 +11615,9 @@ DEFVAR_BOOL ("x-underline-at-descent-line", &x_underline_at_descent_line, doc: /* *Non-nil means to draw the underline at the same place as the descent line. -nil means to draw the underline according to the value of the variable -`x-use-underline-position-properties', which is usually at the baseline -level. The default value is nil. */); +A value of nil means to draw the underline according to the value of the +variable `x-use-underline-position-properties', which is usually at the +baseline level. The default value is nil. */); x_underline_at_descent_line = 0; DEFVAR_BOOL ("x-mouse-click-focus-ignore-position",
--- a/vms/make-mms-derivative.el Fri Dec 15 01:34:17 2006 +0000 +++ b/vms/make-mms-derivative.el Sat Dec 16 01:29:26 2006 +0000 @@ -1,6 +1,6 @@ ;;; make-mms-derivative.el --- framework to do horrible things for VMS support -;; Copyright (C) 2005, 2006 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ;; Author: Thien-Thi Nguyen <ttn@gnu.org> ;; Keywords: maint build vms mms makefile levitte autoconf war-is-a-lose