Now on revision 108075. ------------------------------------------------------------ revno: 108075 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 23:59:34 -0700 message: Remove no-byte-compile setting from some lisp/term files. Not that compiling these will bring any noticeable speed benefit, but there's really no reason not to compile them. The extra disk space and build time is negligible, and it might reveal use of obsolete functions, bugs, etc. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-05-01 00:21:23 +0000 +++ lisp/ChangeLog 2012-05-01 06:59:34 +0000 @@ -1,3 +1,12 @@ +2012-05-01 Glenn Morris + + * term/AT386.el, term/apollo.el, term/bobcat.el, term/cygwin.el: + * term/iris-ansi.el, term/linux.el, term/lk201.el, term/news.el: + * term/screen.el, term/vt102.el, term/vt125.el, term/vt200.el: + * term/vt201.el, term/vt220.el, term/vt240.el, term/vt300.el: + * term/vt320.el, term/vt400.el, term/vt420.el, term/wyse50.el: + Remove no-byte-compile setting. + 2012-05-01 Stefan Monnier * minibuffer.el (completion-table-with-quoting): Fix compatibility === modified file 'lisp/term/AT386.el' --- lisp/term/AT386.el 2012-01-19 07:21:25 +0000 +++ lisp/term/AT386.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,4 @@ -;;; AT386.el --- terminal support package for IBM AT keyboards -*- no-byte-compile: t -*- +;;; AT386.el --- terminal support package for IBM AT keyboards ;; Copyright (C) 1992, 2001-2012 Free Software Foundation, Inc. === modified file 'lisp/term/apollo.el' --- lisp/term/apollo.el 2011-01-15 23:16:57 +0000 +++ lisp/term/apollo.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- (defun terminal-init-apollo () "Terminal initialization function for apollo." (tty-run-terminal-initialization (selected-frame) "vt100")) === modified file 'lisp/term/bobcat.el' --- lisp/term/bobcat.el 2011-01-15 23:16:57 +0000 +++ lisp/term/bobcat.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- (defun terminal-init-bobcat () "Terminal initialization function for bobcat." === modified file 'lisp/term/cygwin.el' --- lisp/term/cygwin.el 2011-01-15 23:16:57 +0000 +++ lisp/term/cygwin.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,4 @@ -;;; cygwin.el --- support for the Cygwin terminal -*- no-byte-compile: t -*- +;;; cygwin.el --- support for the Cygwin terminal ;;; The Cygwin terminal can't really display underlines. === modified file 'lisp/term/iris-ansi.el' --- lisp/term/iris-ansi.el 2012-01-19 07:21:25 +0000 +++ lisp/term/iris-ansi.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,4 @@ -;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*- +;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps ;; Copyright (C) 1997, 2001-2012 Free Software Foundation, Inc. === modified file 'lisp/term/linux.el' --- lisp/term/linux.el 2011-01-15 23:16:57 +0000 +++ lisp/term/linux.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- ;; The Linux console handles Latin-1 by default. (defun terminal-init-linux () === modified file 'lisp/term/lk201.el' --- lisp/term/lk201.el 2011-02-10 16:56:00 +0000 +++ lisp/term/lk201.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- ;; Define function key sequences for DEC terminals. (defvar lk201-function-map === modified file 'lisp/term/news.el' --- lisp/term/news.el 2012-01-19 07:21:25 +0000 +++ lisp/term/news.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,4 @@ -;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*- +;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard ;; Copyright (C) 1989, 1993, 2001-2012 Free Software Foundation, Inc. === modified file 'lisp/term/screen.el' --- lisp/term/screen.el 2011-02-27 21:26:22 +0000 +++ lisp/term/screen.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- ;; Treat a screen terminal similar to an xterm. (load "term/xterm") === modified file 'lisp/term/vt102.el' --- lisp/term/vt102.el 2011-01-15 23:16:57 +0000 +++ lisp/term/vt102.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- (defun terminal-init-vt102 () "Terminal initialization function for vt102." === modified file 'lisp/term/vt125.el' --- lisp/term/vt125.el 2011-01-15 23:16:57 +0000 +++ lisp/term/vt125.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- (defun terminal-init-vt125 () "Terminal initialization function for vt125." === modified file 'lisp/term/vt200.el' --- lisp/term/vt200.el 2011-01-15 23:16:57 +0000 +++ lisp/term/vt200.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- ;; For our purposes we can treat the vt200 and vt100 almost alike. ;; Most differences are handled by the termcap entry. (defun terminal-init-vt200 () === modified file 'lisp/term/vt201.el' --- lisp/term/vt201.el 2011-01-15 23:16:57 +0000 +++ lisp/term/vt201.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- ;; For our purposes we can treat the vt200 and vt100 almost alike. ;; Most differences are handled by the termcap entry. (defun terminal-init-vt201 () === modified file 'lisp/term/vt220.el' --- lisp/term/vt220.el 2011-01-15 23:16:57 +0000 +++ lisp/term/vt220.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- ;; For our purposes we can treat the vt200 and vt100 almost alike. ;; Most differences are handled by the termcap entry. (defun terminal-init-vt220 () === modified file 'lisp/term/vt240.el' --- lisp/term/vt240.el 2011-01-15 23:16:57 +0000 +++ lisp/term/vt240.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- ;; For our purposes we can treat the vt200 and vt100 almost alike. ;; Most differences are handled by the termcap entry. (defun terminal-init-vt240 () === modified file 'lisp/term/vt300.el' --- lisp/term/vt300.el 2011-01-15 23:16:57 +0000 +++ lisp/term/vt300.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- (defun terminal-init-vt300 () "Terminal initialization function for vt300." (tty-run-terminal-initialization (selected-frame) "vt100") === modified file 'lisp/term/vt320.el' --- lisp/term/vt320.el 2011-01-15 23:16:57 +0000 +++ lisp/term/vt320.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- (defun terminal-init-vt320 () "Terminal initialization function for vt320." (tty-run-terminal-initialization (selected-frame) "vt100") === modified file 'lisp/term/vt400.el' --- lisp/term/vt400.el 2011-01-15 23:16:57 +0000 +++ lisp/term/vt400.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- (defun terminal-init-vt400 () "Terminal initialization function for vt400." (tty-run-terminal-initialization (selected-frame) "vt100") === modified file 'lisp/term/vt420.el' --- lisp/term/vt420.el 2011-01-15 23:16:57 +0000 +++ lisp/term/vt420.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,3 @@ -;; -*- no-byte-compile: t -*- (defun terminal-init-vt420 () "Terminal initialization function for vt420." (tty-run-terminal-initialization (selected-frame) "vt100") === modified file 'lisp/term/wyse50.el' --- lisp/term/wyse50.el 2012-01-19 07:21:25 +0000 +++ lisp/term/wyse50.el 2012-05-01 06:59:34 +0000 @@ -1,4 +1,4 @@ -;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*- +;;; wyse50.el --- terminal support code for Wyse 50 ;; Copyright (C) 1989, 1993-1994, 2001-2012 Free Software Foundation, Inc. @@ -141,7 +141,7 @@ M-r M-x move-to-window-line, Funct up-arrow or down-arrow are similar" (interactive) ;; Not needed any more now that we use input-decode-map. - ;; (dolist (key-definition + ;; (dolist (key-definition ;; ;; By unsetting C-a and then binding it to a prefix, we ;; ;; allow the rest of the function keys which start with C-a ;; ;; to be recognized. ------------------------------------------------------------ revno: 108074 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 20:45:39 -0700 message: Remove references to macros that are not defined anywhere * src/syssignal.h: Remove reference to BROKEN_SIGINFO (last used in s/ptx4.h), BROKEN_SIGTSTP (last used in m/ustation.h, m/dpx2.h), and BROKEN_SIGURG (was in s/gnu-linux.h prior to 2008-02-10). All were removed before 23.1. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-01 00:30:11 +0000 +++ src/ChangeLog 2012-05-01 03:45:39 +0000 @@ -1,5 +1,10 @@ 2012-05-01 Glenn Morris + * syssignal.h: Remove reference to BROKEN_SIGINFO (last used in + s/ptx4.h), BROKEN_SIGTSTP (last used in m/ustation.h, m/dpx2.h), + and BROKEN_SIGURG (was in s/gnu-linux.h prior to 2008-02-10). + All were removed before 23.1. + * dispnew.c: Remove HAVE_LIBNCURSES test; it is always true on relevant platforms. === modified file 'src/syssignal.h' --- src/syssignal.h 2012-01-19 07:21:25 +0000 +++ src/syssignal.h 2012-05-01 03:45:39 +0000 @@ -1,5 +1,6 @@ /* syssignal.h - System-dependent definitions for signals. - Copyright (C) 1993, 1999, 2001-2012 Free Software Foundation, Inc. + +Copyright (C) 1993, 1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -82,24 +83,18 @@ #define sigfree() sigsetmask (SIGEMPTYMASK) -#if defined (SIGINFO) && defined (BROKEN_SIGINFO) -#undef SIGINFO -#endif #if defined (SIGIO) && defined (BROKEN_SIGIO) # undef SIGIO #endif +/* Last user: m/ibmrs6000.h */ #if defined (SIGPOLL) && defined (BROKEN_SIGPOLL) #undef SIGPOLL #endif -#if defined (SIGTSTP) && defined (BROKEN_SIGTSTP) -#undef SIGTSTP -#endif -#if defined (SIGURG) && defined (BROKEN_SIGURG) -#undef SIGURG -#endif +/* Last user: m/ibmrs6000.h */ #if defined (SIGAIO) && defined (BROKEN_SIGAIO) #undef SIGAIO #endif +/* Last user: m/ibmrs6000.h */ #if defined (SIGPTY) && defined (BROKEN_SIGPTY) #undef SIGPTY #endif ------------------------------------------------------------ revno: 108073 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 21:13:18 -0400 message: Fix typo in previous rpath-related change (thanks hydra) diff: === modified file 'configure.in' --- configure.in 2012-05-01 01:07:14 +0000 +++ configure.in 2012-05-01 01:13:18 +0000 @@ -1503,7 +1503,7 @@ if test "${x_libraries}" != NONE; then if test -n "${x_libraries}"; then LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` - LD_SWITCH_X_SITE_RPATH=-Wl,-rpath`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath/g"` + LD_SWITCH_X_SITE_RPATH=-Wl,-rpath,`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath,/g"` fi x_default_search_path="" x_search_path=${x_libraries} ------------------------------------------------------------ revno: 108072 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 21:07:14 -0400 message: Use libtinfo in preference to libncurses (bug#9741) * configure.in: Try libtinfo for tputs. (LIBS_TERMCAP) [gnu*]: Use libtinfo if it was found. * etc/NEWS: Mention this. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-01 00:56:47 +0000 +++ ChangeLog 2012-05-01 01:07:14 +0000 @@ -1,5 +1,8 @@ 2012-05-01 Glenn Morris + * configure.in: Try libtinfo for tputs. + (LIBS_TERMCAP) [gnu*]: Use libtinfo if it was found. (Bug#9741) + * configure.in: Combine adjacent $opsys case blocks. * configure.in (LIBS_TERMCAP): Remove unreachable branch for sol2. === modified file 'configure.in' --- configure.in 2012-05-01 00:56:47 +0000 +++ configure.in 2012-05-01 01:07:14 +0000 @@ -2868,7 +2868,7 @@ ]) # Maybe curses should be tried earlier? # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 -for tputs_library in '' ncurses terminfo termcap curses; do +for tputs_library in '' tinfo ncurses terminfo termcap curses; do OLIBS=$LIBS if test -z "$tputs_library"; then LIBS_TERMCAP= @@ -2888,7 +2888,8 @@ AC_MSG_RESULT([$msg]) if test "X$msg" = Xno; then AC_MSG_ERROR([The required function `tputs' was not found in any library. -These libraries were tried: libncurses, libterminfo, libtermcap, libcurses. +The following libraries were tried (in order): + libtinfo, libncurses, libterminfo, libtermcap, libcurses Please try installing whichever of these libraries is most appropriate for your system, together with its header files. For example, a libncurses-dev(el) or similar package.]) @@ -2897,12 +2898,18 @@ ## Use termcap instead of terminfo? ## Only true for: freebsd < 40000, ms-w32, msdos, netbsd < 599002500. TERMINFO=yes +## FIXME? In the cases below where we unconditionally set +## LIBS_TERMCAP="-lncurses", this overrides LIBS_TERMCAP = -ltinfo, +## if that was found above to have tputs. +## Should we use the gnu* logic everywhere? case "$opsys" in ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2. ## The ncurses library has been moved out of the System framework in ## Mac OS X 10.2. So if configure detects it, set the command-line ## option to use it. - darwin|gnu*) LIBS_TERMCAP="-lncurses" ;; + darwin) LIBS_TERMCAP="-lncurses" ;; + + gnu*) [ "x$LIBS_TERMCAP" = x ] && LIBS_TERMCAP="-lncurses" ;; freebsd) AC_MSG_CHECKING([whether FreeBSD is new enough to use terminfo]) === modified file 'etc/NEWS' --- etc/NEWS 2012-04-27 03:10:38 +0000 +++ etc/NEWS 2012-05-01 01:07:14 +0000 @@ -29,6 +29,9 @@ no warnings; on older and on non-GNU systems the generated warnings may be useful. +--- +** Emacs uses libtinfo in preference to libncurses, if available. + * Startup Changes in Emacs 24.2 ------------------------------------------------------------ revno: 108071 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 20:56:47 -0400 message: * configure.in: Combine adjacent $opsys case blocks. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-01 00:50:55 +0000 +++ ChangeLog 2012-05-01 00:56:47 +0000 @@ -1,5 +1,7 @@ 2012-05-01 Glenn Morris + * configure.in: Combine adjacent $opsys case blocks. + * configure.in (LIBS_TERMCAP): Remove unreachable branch for sol2. * configure.in: Invert the TERMINFO logic, === modified file 'configure.in' --- configure.in 2012-05-01 00:50:55 +0000 +++ configure.in 2012-05-01 00:56:47 +0000 @@ -2932,9 +2932,8 @@ fi ;; -esac + openbsd) LIBS_TERMCAP="-lncurses" ;; -case "$opsys" in ## hpux: Make sure we get select from libc rather than from libcurses ## because libcurses on HPUX 10.10 has a broken version of select. ## We used to use -lc -lcurses, but this may be cleaner. @@ -2942,7 +2941,6 @@ # set that way, now it uses the default). Isn't this a contradiction? hpux*) LIBS_TERMCAP="-ltermcap" ;; - openbsd) LIBS_TERMCAP="-lncurses" ;; esac TERMCAP_OBJ=tparam.o ------------------------------------------------------------ revno: 108070 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 20:50:55 -0400 message: * configure.in (LIBS_TERMCAP): Remove unreachable branch for sol2. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-01 00:46:02 +0000 +++ ChangeLog 2012-05-01 00:50:55 +0000 @@ -1,5 +1,7 @@ 2012-05-01 Glenn Morris + * configure.in (LIBS_TERMCAP): Remove unreachable branch for sol2. + * configure.in: Invert the TERMINFO logic, since "yes" is far more common than "no". === modified file 'configure.in' --- configure.in 2012-05-01 00:46:02 +0000 +++ configure.in 2012-05-01 00:50:55 +0000 @@ -2938,12 +2938,11 @@ ## hpux: Make sure we get select from libc rather than from libcurses ## because libcurses on HPUX 10.10 has a broken version of select. ## We used to use -lc -lcurses, but this may be cleaner. + ## FIXME? But TERMINFO = yes on hpux (it used to be explicitly + # set that way, now it uses the default). Isn't this a contradiction? hpux*) LIBS_TERMCAP="-ltermcap" ;; openbsd) LIBS_TERMCAP="-lncurses" ;; - - ## Must use system termcap, if we use any termcap. It does special things. - sol2*) test "$TERMINFO" != yes && LIBS_TERMCAP="-ltermcap" ;; esac TERMCAP_OBJ=tparam.o ------------------------------------------------------------ revno: 108069 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 20:46:02 -0400 message: * configure.in: Invert the TERMINFO logic (since "yes" is far more common than "no") diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-01 00:30:11 +0000 +++ ChangeLog 2012-05-01 00:46:02 +0000 @@ -1,5 +1,8 @@ 2012-05-01 Glenn Morris + * configure.in: Invert the TERMINFO logic, + since "yes" is far more common than "no". + * configure.in (HAVE_LIBNCURSES): Remove; it is required to be true. * configure.in (LD_SWITCH_X_SITE_RPATH): === modified file 'configure.in' --- configure.in 2012-05-01 00:34:56 +0000 +++ configure.in 2012-05-01 00:46:02 +0000 @@ -2894,25 +2894,15 @@ For example, a libncurses-dev(el) or similar package.]) fi -## Use terminfo instead of termcap? -## Note only system files NOT using terminfo are: -## freebsd < 40000, ms-w32, msdos, netbsd < 599002500 -TERMINFO=no +## Use termcap instead of terminfo? +## Only true for: freebsd < 40000, ms-w32, msdos, netbsd < 599002500. +TERMINFO=yes case "$opsys" in - ## cygwin: Fewer environment variables to go wrong, more terminal types. - ## hpux10-20: Use the system provided termcap(3) library. - ## openbsd: David Mazieres says this - ## is necessary. Otherwise Emacs dumps core when run -nw. - aix4-2|cygwin|hpux*|irix6-5|openbsd|sol2*|unixware) TERMINFO=yes ;; - ## darwin: Prevents crashes when running Emacs in Terminal.app under 10.2. ## The ncurses library has been moved out of the System framework in ## Mac OS X 10.2. So if configure detects it, set the command-line ## option to use it. - darwin|gnu*) - TERMINFO=yes - LIBS_TERMCAP="-lncurses" - ;; + darwin|gnu*) LIBS_TERMCAP="-lncurses" ;; freebsd) AC_MSG_CHECKING([whether FreeBSD is new enough to use terminfo]) @@ -2926,18 +2916,18 @@ AC_MSG_RESULT($emacs_cv_freebsd_terminfo) if test $emacs_cv_freebsd_terminfo = yes; then - TERMINFO=yes LIBS_TERMCAP="-lncurses" else + TERMINFO=no LIBS_TERMCAP="-ltermcap" fi ;; netbsd) if test $ac_cv_search_tputs = -lterminfo; then - TERMINFO=yes LIBS_TERMCAP="-lterminfo" else + TERMINFO=no LIBS_TERMCAP="-ltermcap" fi ;; ------------------------------------------------------------ revno: 108068 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 20:34:56 -0400 message: Update comment in configure.in diff: === modified file 'configure.in' --- configure.in 2012-05-01 00:30:11 +0000 +++ configure.in 2012-05-01 00:34:56 +0000 @@ -2896,8 +2896,7 @@ ## Use terminfo instead of termcap? ## Note only system files NOT using terminfo are: -## freebsd < 40000, ms-w32, msdos, netbsd < 599002500, and -## darwin|gnu without ncurses. +## freebsd < 40000, ms-w32, msdos, netbsd < 599002500 TERMINFO=no case "$opsys" in ## cygwin: Fewer environment variables to go wrong, more terminal types. ------------------------------------------------------------ revno: 108067 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 20:30:11 -0400 message: Remove HAVE_LIBNCURSES; it is required to be true Also, it was a confusing name, since it does not necessarily mean that we literally have libncurses; rather that we have tputs etc. * configure.in (HAVE_LIBNCURSES): Remove; it is required to be true. * src/dispnew.c: Remove HAVE_LIBNCURSES test; it is always true on relevant platforms. * nt/config.nt (HAVE_LIBNCURSES): Remove undef; not needed. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-01 00:16:02 +0000 +++ ChangeLog 2012-05-01 00:30:11 +0000 @@ -1,5 +1,7 @@ 2012-05-01 Glenn Morris + * configure.in (HAVE_LIBNCURSES): Remove; it is required to be true. + * configure.in (LD_SWITCH_X_SITE_RPATH): Rename from LD_SWITCH_X_SITE_AUX_RPATH. === modified file 'configure.in' --- configure.in 2012-05-01 00:16:02 +0000 +++ configure.in 2012-05-01 00:30:11 +0000 @@ -2893,12 +2893,6 @@ for your system, together with its header files. For example, a libncurses-dev(el) or similar package.]) fi -# Must define this when any termcap library is found. -AC_DEFINE(HAVE_LIBNCURSES, 1, - [Define to 1 if you have the `ncurses' library (-lncurses).]) -## FIXME This was the cpp logic, but I am not sure it is right. -## The above test has not necessarily found libncurses. -HAVE_LIBNCURSES=yes ## Use terminfo instead of termcap? ## Note only system files NOT using terminfo are: @@ -2917,11 +2911,8 @@ ## Mac OS X 10.2. So if configure detects it, set the command-line ## option to use it. darwin|gnu*) - ## (HAVE_LIBNCURSES was not always true, but is since 2010-03-18.) - if test "x$HAVE_LIBNCURSES" = "xyes"; then - TERMINFO=yes - LIBS_TERMCAP="-lncurses" - fi + TERMINFO=yes + LIBS_TERMCAP="-lncurses" ;; freebsd) === modified file 'nt/ChangeLog' --- nt/ChangeLog 2012-04-15 02:59:30 +0000 +++ nt/ChangeLog 2012-05-01 00:30:11 +0000 @@ -1,3 +1,7 @@ +2012-05-01 Glenn Morris + + * config.nt (HAVE_LIBNCURSES): Remove undef; not needed. + 2012-04-14 Dani Moncayo (tiny change) * makefile.w32-in: Fix typo (Bug#10261). === modified file 'nt/config.nt' --- nt/config.nt 2012-04-07 20:00:16 +0000 +++ nt/config.nt 2012-05-01 00:30:11 +0000 @@ -1,6 +1,6 @@ /* GNU Emacs site configuration template file. -*- C -*- -Copyright (C) 1988, 1993-1994, 2001-2012 Free Software Foundation, Inc. +Copyright (C) 1988, 1993-1994, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -138,7 +138,6 @@ #undef HAVE_LIBPTHREADS #undef HAVE_LIBRESOLV #undef HAVE_LIBXMU -#undef HAVE_LIBNCURSES #undef HAVE_LIBINTL /* movemail Kerberos support */ === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-01 00:16:02 +0000 +++ src/ChangeLog 2012-05-01 00:30:11 +0000 @@ -1,5 +1,8 @@ 2012-05-01 Glenn Morris + * dispnew.c: Remove HAVE_LIBNCURSES test; + it is always true on relevant platforms. + * Makefile.in (LD_SWITCH_X_SITE_RPATH): Rename from LD_SWITCH_X_SITE_AUX_RPATH. === modified file 'src/dispnew.c' --- src/dispnew.c 2012-04-20 14:08:55 +0000 +++ src/dispnew.c 2012-05-01 00:30:11 +0000 @@ -1,5 +1,6 @@ /* Updating of data structures for redisplay. - Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc. + +Copyright (C) 1985-1988, 1993-1995, 1997-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -87,7 +88,7 @@ #endif #endif /* not __GNU_LIBRARY__ */ -#if defined (HAVE_TERM_H) && defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) +#if defined (HAVE_TERM_H) && defined (GNU_LINUX) #include /* for tgetent */ #endif @@ -6303,7 +6304,7 @@ #ifdef HAVE_X11 Vwindow_system_version = make_number (11); #endif -#if defined (GNU_LINUX) && defined (HAVE_LIBNCURSES) +#ifdef GNU_LINUX /* In some versions of ncurses, tputs crashes if we have not called tgetent. So call tgetent. */ ------------------------------------------------------------ revno: 108066 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2012-04-30 20:21:23 -0400 message: * lisp/minibuffer.el (completion-table-with-quoting): Fix compatibility all-completions code to not return a number in the last cdr. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-30 11:57:47 +0000 +++ lisp/ChangeLog 2012-05-01 00:21:23 +0000 @@ -1,3 +1,8 @@ +2012-05-01 Stefan Monnier + + * minibuffer.el (completion-table-with-quoting): Fix compatibility + all-completions code to not return a number in the last cdr. + 2012-04-30 Leo Liu * ibuf-ext.el (ibuffer-diff-buffer-with-file-1): Avoid buffer === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2012-04-26 03:18:47 +0000 +++ lisp/minibuffer.el 2012-05-01 00:21:23 +0000 @@ -420,6 +420,13 @@ (length string)))))) (list* 'boundaries qlboundary qrboundary))) + ;; In "normal" use a c-t-with-quoting completion table should never be + ;; called with action in (t nil) because `completion--unquote' should have + ;; been called before and would have returned a different completion table + ;; to apply to the unquoted text. But there's still a lot of code around + ;; that likes to use all/try-completions directly, so we do our best to + ;; handle those calls as well as we can. + ((eq action nil) ;;try-completion (let* ((ustring (funcall unquote string)) (completion (try-completion ustring table pred))) @@ -447,10 +454,14 @@ (pcase-let* ((ustring (funcall unquote string)) (completions (all-completions ustring table pred)) - (boundary (car (completion-boundaries ustring table pred "")))) - (completion--twq-all - string ustring completions boundary unquote requote))) - + (boundary (car (completion-boundaries ustring table pred ""))) + (completions + (completion--twq-all + string ustring completions boundary unquote requote)) + (last (last completions))) + (when (consp last) (setcdr last nil)) + completions)) + ((eq action 'completion--unquote) (let ((ustring (funcall unquote string)) (uprefix (funcall unquote (substring string 0 pred)))) ------------------------------------------------------------ revno: 108065 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 20:16:02 -0400 message: Rename autoconf output variable LD_SWITCH_X_SITE_AUX_RPATH * configure.in (LD_SWITCH_X_SITE_RPATH): Rename from LD_SWITCH_X_SITE_AUX_RPATH. * src/Makefile.in (LD_SWITCH_X_SITE_RPATH): Rename from LD_SWITCH_X_SITE_AUX_RPATH. diff: === modified file 'ChangeLog' --- ChangeLog 2012-05-01 00:12:02 +0000 +++ ChangeLog 2012-05-01 00:16:02 +0000 @@ -1,5 +1,8 @@ 2012-05-01 Glenn Morris + * configure.in (LD_SWITCH_X_SITE_RPATH): + Rename from LD_SWITCH_X_SITE_AUX_RPATH. + * configure.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used. 2012-04-26 Glenn Morris === modified file 'configure.in' --- configure.in 2012-05-01 00:12:02 +0000 +++ configure.in 2012-05-01 00:16:02 +0000 @@ -973,7 +973,7 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM" -## This setting of LD_SWITCH_SYSTEM references LD_SWITCH_X_SITE_AUX_RPATH, +## This setting of LD_SWITCH_SYSTEM references LD_SWITCH_X_SITE_RPATH, ## which has not been defined yet. When this was handled with cpp, ## it was expanded to null when configure sourced the s/*.h file. ## Thus LD_SWITCH_SYSTEM had different values in configure and the Makefiles. @@ -985,7 +985,7 @@ ## LD_SWITCH_SYSTEM_TEMACS. case "$opsys" in netbsd|openbsd) - LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_AUX_RPATH) $LD_SWITCH_SYSTEM" ;; + LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_RPATH) $LD_SWITCH_SYSTEM" ;; esac @@ -1499,11 +1499,11 @@ window_system=x11 fi -LD_SWITCH_X_SITE_AUX_RPATH= +LD_SWITCH_X_SITE_RPATH= if test "${x_libraries}" != NONE; then if test -n "${x_libraries}"; then LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` - LD_SWITCH_X_SITE_AUX_RPATH=-Wl,-rpath`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath/g"` + LD_SWITCH_X_SITE_RPATH=-Wl,-rpath`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath/g"` fi x_default_search_path="" x_search_path=${x_libraries} @@ -1526,7 +1526,7 @@ fi done fi -AC_SUBST(LD_SWITCH_X_SITE_AUX_RPATH) +AC_SUBST(LD_SWITCH_X_SITE_RPATH) if test "${x_includes}" != NONE && test -n "${x_includes}"; then C_SWITCH_X_SITE="$isystem"`echo ${x_includes} | sed -e "s/:/ $isystem/g"` @@ -1854,9 +1854,9 @@ CPPFLAGS="$C_SWITCH_X_SITE $CPPFLAGS" # On Solaris, arrange for LD_RUN_PATH to point to the X libraries for tests. - # This is handled by LD_SWITCH_X_SITE_AUX_RPATH during the real build, + # This is handled by LD_SWITCH_X_SITE_RPATH during the real build, # but it's more convenient here to set LD_RUN_PATH since this - # also works on hosts that don't understand LD_SWITCH_X_SITE_AUX_RPATH. + # also works on hosts that don't understand LD_SWITCH_X_SITE_RPATH. if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then LD_RUN_PATH=$x_libraries${LD_RUN_PATH+:}$LD_RUN_PATH export LD_RUN_PATH @@ -3506,14 +3506,14 @@ LD_SWITCH_SYSTEM_TEMACS="-X $LD_SWITCH_SYSTEM_TEMACS" ;; - ## LD_SWITCH_X_SITE_AUX_RPATH is a -rpath option saying where to + ## LD_SWITCH_X_SITE_RPATH is a -rpath option saying where to ## find X at run-time. ## When handled by cpp, this was in LD_SWITCH_SYSTEM. However, at the - ## point where configure sourced the s/*.h file, LD_SWITCH_X_SITE_AUX_RPATH + ## point where configure sourced the s/*.h file, LD_SWITCH_X_SITE_RPATH ## had not yet been defined and was expanded to null. Hence LD_SWITCH_SYSTEM ## had different values in configure (in ac_link) and src/Makefile.in. ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. - gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_AUX_RPATH)" ;; + gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;; *) LD_SWITCH_SYSTEM_TEMACS= ;; esac === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-01 00:12:02 +0000 +++ src/ChangeLog 2012-05-01 00:16:02 +0000 @@ -1,5 +1,8 @@ 2012-05-01 Glenn Morris + * Makefile.in (LD_SWITCH_X_SITE_RPATH): + Rename from LD_SWITCH_X_SITE_AUX_RPATH. + * Makefile.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used. 2012-04-30 Andreas Schwab === modified file 'src/Makefile.in' --- src/Makefile.in 2012-05-01 00:12:02 +0000 +++ src/Makefile.in 2012-05-01 00:16:02 +0000 @@ -96,7 +96,7 @@ ## This must come before LD_SWITCH_SYSTEM. ## If needed, a -rpath option that says where to find X windows at run time. -LD_SWITCH_X_SITE_AUX_RPATH=@LD_SWITCH_X_SITE_AUX_RPATH@ +LD_SWITCH_X_SITE_RPATH=@LD_SWITCH_X_SITE_RPATH@ ## System-specific LDFLAGS. LD_SWITCH_SYSTEM=@LD_SWITCH_SYSTEM@ ------------------------------------------------------------ revno: 108064 committer: Glenn Morris branch nick: trunk timestamp: Mon 2012-04-30 20:12:02 -0400 message: Remove LD_SWITCH_X_SITE_AUX, which is no longer used * configure.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used. * src/Makefile.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used. diff: === modified file 'ChangeLog' --- ChangeLog 2012-04-26 01:47:05 +0000 +++ ChangeLog 2012-05-01 00:12:02 +0000 @@ -1,3 +1,7 @@ +2012-05-01 Glenn Morris + + * configure.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used. + 2012-04-26 Glenn Morris * make-dist: No more doc/lispref/tindex.pl. === modified file 'configure.in' --- configure.in 2012-04-23 05:43:08 +0000 +++ configure.in 2012-05-01 00:12:02 +0000 @@ -973,7 +973,7 @@ ac_link="$ac_link $LD_SWITCH_SYSTEM" -## This setting of LD_SWITCH_SYSTEM references LD_SWITCH_X_SITE_AUX, +## This setting of LD_SWITCH_SYSTEM references LD_SWITCH_X_SITE_AUX_RPATH, ## which has not been defined yet. When this was handled with cpp, ## it was expanded to null when configure sourced the s/*.h file. ## Thus LD_SWITCH_SYSTEM had different values in configure and the Makefiles. @@ -985,7 +985,6 @@ ## LD_SWITCH_SYSTEM_TEMACS. case "$opsys" in netbsd|openbsd) - ## _AUX_RPATH is like _AUX, but uses -rpath instead of -R. LD_SWITCH_SYSTEM="\$(LD_SWITCH_X_SITE_AUX_RPATH) $LD_SWITCH_SYSTEM" ;; esac @@ -1500,13 +1499,11 @@ window_system=x11 fi -LD_SWITCH_X_SITE_AUX= LD_SWITCH_X_SITE_AUX_RPATH= if test "${x_libraries}" != NONE; then if test -n "${x_libraries}"; then LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"` - LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"` - LD_SWITCH_X_SITE_AUX_RPATH=`echo ${LD_SWITCH_X_SITE_AUX} | sed -e 's/-R/-Wl,-rpath,/'` + LD_SWITCH_X_SITE_AUX_RPATH=-Wl,-rpath`echo ${x_libraries} | sed -e "s/:/ -Wl,-rpath/g"` fi x_default_search_path="" x_search_path=${x_libraries} @@ -1529,7 +1526,6 @@ fi done fi -AC_SUBST(LD_SWITCH_X_SITE_AUX) AC_SUBST(LD_SWITCH_X_SITE_AUX_RPATH) if test "${x_includes}" != NONE && test -n "${x_includes}"; then @@ -1858,9 +1854,9 @@ CPPFLAGS="$C_SWITCH_X_SITE $CPPFLAGS" # On Solaris, arrange for LD_RUN_PATH to point to the X libraries for tests. - # This is handled by LD_SWITCH_X_SITE_AUX during the real build, - # but it's more convenient here to set LD_RUN_PATH - # since this also works on hosts that don't understand LD_SWITCH_X_SITE_AUX. + # This is handled by LD_SWITCH_X_SITE_AUX_RPATH during the real build, + # but it's more convenient here to set LD_RUN_PATH since this + # also works on hosts that don't understand LD_SWITCH_X_SITE_AUX_RPATH. if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then LD_RUN_PATH=$x_libraries${LD_RUN_PATH+:}$LD_RUN_PATH export LD_RUN_PATH @@ -3510,9 +3506,10 @@ LD_SWITCH_SYSTEM_TEMACS="-X $LD_SWITCH_SYSTEM_TEMACS" ;; - ## LD_SWITCH_X_SITE_AUX is a -R option saying where to find X at run-time. - ## When handled by cpp, this was in LD_SWITCH_SYSTEM. However, at - ## the point where configure sourced the s/*.h file, LD_SWITCH_X_SITE_AUX + ## LD_SWITCH_X_SITE_AUX_RPATH is a -rpath option saying where to + ## find X at run-time. + ## When handled by cpp, this was in LD_SWITCH_SYSTEM. However, at the + ## point where configure sourced the s/*.h file, LD_SWITCH_X_SITE_AUX_RPATH ## had not yet been defined and was expanded to null. Hence LD_SWITCH_SYSTEM ## had different values in configure (in ac_link) and src/Makefile.in. ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. === modified file 'src/ChangeLog' --- src/ChangeLog 2012-05-01 00:07:23 +0000 +++ src/ChangeLog 2012-05-01 00:12:02 +0000 @@ -1,3 +1,7 @@ +2012-05-01 Glenn Morris + + * Makefile.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used. + 2012-04-30 Andreas Schwab * .gdbinit (xpr): Remove checks for no longer existing misc types. === modified file 'src/Makefile.in' --- src/Makefile.in 2012-04-14 04:37:44 +0000 +++ src/Makefile.in 2012-05-01 00:12:02 +0000 @@ -94,10 +94,8 @@ ## substituted in this or any other Makefile. Cf C_SWITCH_X_SITE. LD_SWITCH_X_SITE= -## Next two must come before LD_SWITCH_SYSTEM. -## If needed, a -R option that says where to find X windows at run time. -LD_SWITCH_X_SITE_AUX=@LD_SWITCH_X_SITE_AUX@ -## As above, but using -rpath instead. +## This must come before LD_SWITCH_SYSTEM. +## If needed, a -rpath option that says where to find X windows at run time. LD_SWITCH_X_SITE_AUX_RPATH=@LD_SWITCH_X_SITE_AUX_RPATH@ ## System-specific LDFLAGS. ------------------------------------------------------------ revno: 108063 committer: Andreas Schwab branch nick: emacs timestamp: Tue 2012-05-01 02:07:23 +0200 message: * .gdbinit (xpr): Remove checks for no longer existing misc types. (xintfwd, xboolfwd, xobjfwd, xbufobjfwd, xkbobjfwd, xbuflocal): Remove. diff: === modified file 'src/.gdbinit' --- src/.gdbinit 2012-04-24 19:05:25 +0000 +++ src/.gdbinit 2012-05-01 00:07:23 +0000 @@ -703,60 +703,6 @@ This command assumes that $ is an Emacs Lisp Misc value. end -define xintfwd - xgetptr $ - print (struct Lisp_Intfwd *) $ptr -end -document xintfwd -Print $ as an integer forwarding pointer. -This command assumes that $ is an Emacs Lisp Misc value. -end - -define xboolfwd - xgetptr $ - print (struct Lisp_Boolfwd *) $ptr -end -document xboolfwd -Print $ as a boolean forwarding pointer. -This command assumes that $ is an Emacs Lisp Misc value. -end - -define xobjfwd - xgetptr $ - print (struct Lisp_Objfwd *) $ptr -end -document xobjfwd -Print $ as an object forwarding pointer. -This command assumes that $ is an Emacs Lisp Misc value. -end - -define xbufobjfwd - xgetptr $ - print (struct Lisp_Buffer_Objfwd *) $ptr -end -document xbufobjfwd -Print $ as a buffer-local object forwarding pointer. -This command assumes that $ is an Emacs Lisp Misc value. -end - -define xkbobjfwd - xgetptr $ - print (struct Lisp_Kboard_Objfwd *) $ptr -end -document xkbobjfwd -Print $ as a kboard-local object forwarding pointer. -This command assumes that $ is an Emacs Lisp Misc value. -end - -define xbuflocal - xgetptr $ - print (struct Lisp_Buffer_Local_Value *) $ptr -end -document xbuflocal -Print $ as a buffer-local-value pointer. -This command assumes that $ is an Emacs Lisp Misc value. -end - define xsymbol set $sym = $ xgetptr $sym @@ -1030,36 +976,12 @@ if $misc == Lisp_Misc_Free xmiscfree end - if $misc == Lisp_Misc_Boolfwd - xboolfwd - end if $misc == Lisp_Misc_Marker xmarker end - if $misc == Lisp_Misc_Intfwd - xintfwd - end - if $misc == Lisp_Misc_Boolfwd - xboolfwd - end - if $misc == Lisp_Misc_Objfwd - xobjfwd - end - if $misc == Lisp_Misc_Buffer_Objfwd - xbufobjfwd - end - if $misc == Lisp_Misc_Buffer_Local_Value - xbuflocal - end -# if $misc == Lisp_Misc_Some_Buffer_Local_Value -# xvalue -# end if $misc == Lisp_Misc_Overlay xoverlay end - if $misc == Lisp_Misc_Kboard_Objfwd - xkbobjfwd - end # if $misc == Lisp_Misc_Save_Value # xsavevalue # end === modified file 'src/ChangeLog' --- src/ChangeLog 2012-04-28 22:17:27 +0000 +++ src/ChangeLog 2012-05-01 00:07:23 +0000 @@ -1,3 +1,9 @@ +2012-04-30 Andreas Schwab + + * .gdbinit (xpr): Remove checks for no longer existing misc types. + (xintfwd, xboolfwd, xobjfwd, xbufobjfwd, xkbobjfwd, xbuflocal): + Remove. + 2012-04-28 Paul Eggert Do not avoid creating empty evaporating overlays (Bug#9642). ------------------------------------------------------------ revno: 108062 committer: Leo Liu branch nick: trunk timestamp: Mon 2012-04-30 19:57:47 +0800 message: * lisp/ibuf-ext.el (ibuffer-diff-buffer-with-file-1): Avoid buffer read-only error. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-04-29 01:48:23 +0000 +++ lisp/ChangeLog 2012-04-30 11:57:47 +0000 @@ -1,3 +1,8 @@ +2012-04-30 Leo Liu + + * ibuf-ext.el (ibuffer-diff-buffer-with-file-1): Avoid buffer + read-only error. + 2012-04-29 Chong Yidong * follow.el (follow-calc-win-end): Rewrite to handle partial === modified file 'lisp/ibuf-ext.el' --- lisp/ibuf-ext.el 2012-04-24 03:40:57 +0000 +++ lisp/ibuf-ext.el 2012-04-30 11:57:47 +0000 @@ -1356,8 +1356,8 @@ (diff-sentinel (call-process shell-file-name nil (current-buffer) nil - shell-command-switch command))) - (insert "\n")))) + shell-command-switch command)) + (insert "\n"))))) (sit-for 0) (when (file-exists-p tempfile) (delete-file tempfile))))) ------------------------------------------------------------ revno: 108061 committer: Andreas Schwab branch nick: emacs timestamp: Sun 2012-04-29 22:05:44 +0200 message: Fixes: debbugs:11380 * make-docfile.c (scan_lisp_file) [DEBUG]: Also skip if and byte-code forms. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2012-04-20 10:37:57 +0000 +++ lib-src/ChangeLog 2012-04-29 20:05:44 +0000 @@ -1,3 +1,8 @@ +2012-04-29 Andreas Schwab + + * make-docfile.c (scan_lisp_file) [DEBUG]: Also skip if and + byte-code forms. (Bug#11380) + 2012-04-20 Chong Yidong * emacsclient.c (decode_options): Move -t -n corner case handling === modified file 'lib-src/make-docfile.c' --- lib-src/make-docfile.c 2012-01-19 07:21:25 +0000 +++ lib-src/make-docfile.c 2012-04-29 20:05:44 +0000 @@ -1361,7 +1361,7 @@ #ifdef DEBUG else if (! strcmp (buffer, "if") || ! strcmp (buffer, "byte-code")) - ; + continue; #endif else