From: Glenn Morris Date: Wed, 2 May 2012 07:20:29 +0000 (-0700) Subject: Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org X-Git-Tag: emacs-24.2.90~471^2~216 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=90207a152538c00b6c75b9774b528470dfb42717;p=emacs.git Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org --- 90207a152538c00b6c75b9774b528470dfb42717 diff --cc ChangeLog index e52b39b05ae,bf47bf07d74..5836ea1276b --- a/ChangeLog +++ b/ChangeLog @@@ -1,65 -1,19 +1,84 @@@ + 2012-05-02 Glenn Morris + + * Makefile.in (uninstall): Remove useless-use-of-for; that for + some reason caused problems on an old Solaris. + + * Makefile.in (install-arch-indep, uninstall): + Ensure that INSTALL-type commands are run from top-level. + + * Makefile.in (INFO_FILES): Add emacs-gnutls; accidentally + omitted from 2012-04-12 backport from trunk. + + * info/dir: Make some entries consistent with the source texi files. + + * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04. + -2012-04-18 Ludovic Courtès ++ * info/dir: Make some entries consistent with the source texi files. ++ ++ * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04. ++ +2012-05-02 Glenn Morris + + * Makefile.in (install-arch-indep): + Combine adjacent install-data and install-info loops. + +2012-05-01 Glenn Morris + + * Makefile.in (MAN_PAGES): Remove. + (install-arch-indep, uninstall): Don't use $MAN_PAGES. + + * 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. + + * 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): + Rename from LD_SWITCH_X_SITE_AUX_RPATH. + + * configure.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used. + +2012-04-26 Glenn Morris + + * make-dist: No more doc/lispref/tindex.pl. + +2012-04-22 Michael Albinus + + * configure.in (dbus_validate_bus_name, dbus_validate_path) + (dbus_validate_interface, dbus_validate_member): Check also for + these library functions + +2012-04-22 Paul Eggert + + * configure.in (doug_lea_malloc): Check for __malloc_initialize_hook. + With glibc 2.14 or later, when compiled with GCC 4.7.0's + -Werror=deprecated-declarations flag, use of hooks like + __malloc_initialize_hook causes compilation to fail because these + hooks are deprecated. Modify 'configure' to check for these hooks too. + Simplify the 'configure' code to test for all the hooks at once. + (emacs_cv_var___after_morecore_hook): Remove, replacing with ... + (emacs_cv_var_doug_lea_malloc): ... this new var. + +2012-04-21 Paul Eggert + + Sync from gnulib version 4f11d6bebc3098c64ffde27079ab0d0cecfd0cdc + dated 2011-10-07. Regenerating from current gnulib would be a + pervasive change, and currently the trunk isn't open to such changes. + * configure.in (WARN_CFLAGS): Remove; no longer needed now + that gnulib does it. + * lib/gnulib.mk, m4/gl-comp.m4: Regenerate. + +2012-04-21 Andreas Schwab + + * m4/gl-comp.m4: Update. (Bug#11285) + +2012-04-20 Ludovic Courtès * configure.in: Don't use the -R option (Bug#11251). diff --cc configure.in index 2c2ccccc11a,68d14716e68..c0a12672c62 --- a/configure.in +++ b/configure.in @@@ -2931,10 -2878,9 +2931,8 @@@ fail ;; netbsd) - if test $ac_cv_search_tputs = -lterminfo; then - LIBS_TERMCAP="-lterminfo" - if [ "x$LIBS_TERMCAP" = "x-lterminfo" ]; then - TERMINFO=yes -- else ++ if [ "x$LIBS_TERMCAP" != "x-lterminfo" ]; then + TERMINFO=no LIBS_TERMCAP="-ltermcap" fi ;; diff --cc doc/emacs/ChangeLog index 1a785ffa4c8,4e0a8a8f428..81064afacd7 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,3 -1,26 +1,22 @@@ -2012-05-01 Glenn Morris ++2012-05-02 Glenn Morris + + * emacs.texi (@copying): Only print EDITION in the TeX version. + -2012-04-30 Glenn Morris - + * search.texi (Regexp Search): Just say "Emacs". + + * display.texi (Auto Scrolling): + Reword to avoid repetition and improve page break. + -2012-04-28 Glenn Morris - + * xresources.texi (Resources): + * mule.texi (Language Environments): + * misc.texi (Amusements): + * maintaining.texi (VC Change Log): + * frames.texi (Fonts): + * custom.texi (Specifying File Variables, Minibuffer Maps): + * cmdargs.texi (Initial Options): + * building.texi (Flymake): + Reword to remove/reduce some overly long/short lines. + 2012-04-27 Glenn Morris * emacs.texi: Some fixes for detailed menu. diff --cc doc/lispintro/ChangeLog index d9ebf07952c,5e81e4d080b..04b2803a4a9 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@@ -1,4 -1,8 +1,8 @@@ -2012-04-28 Glenn Morris ++2012-05-02 Glenn Morris + + * emacs-lisp-intro.texi (Syntax): Reword to avoid underfull hbox. + -2012-04-07 Glenn Morris +2012-04-14 Glenn Morris * Makefile.in: Replace non-portable use of $< in ordinary rules. diff --cc doc/lispref/ChangeLog index 9c323d7937f,58508adb899..dd439721f4d --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,4 -1,20 +1,20 @@@ -2012-05-01 Glenn Morris ++2012-05-02 Glenn Morris + + * elisp.texi (@copying): + * intro.texi (Introduction): Only print VERSION in the TeX version. + -2012-04-29 Chong Yidong ++2012-05-02 Chong Yidong + + * text.texi (Change Hooks): Minor fix for after-change-functions. + -2012-04-28 Glenn Morris ++2012-05-02 Glenn Morris + + * package.texi (Packaging Basics): + * loading.texi (Autoload): + * files.texi (Magic File Names): + Reword to remove/reduce some overly long/short lines. + -2012-04-26 Glenn Morris +2012-04-27 Glenn Morris * elisp.texi, vol1.texi, vol2.texi: Some fixes for detailed menu. * modes.texi (Major Modes, Auto-Indentation): diff --cc doc/misc/ChangeLog index 62841734d9f,fb40c033216..e8ebe45e8ba --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,8 -1,18 +1,20 @@@ + 2012-05-02 Glenn Morris + + * viper.texi: Make direntry shorter (also it is no longer "newest"). + + * emacs-gnutls.texi, ert.texi, org.texi: + Fix dircategory, direntry to match info/dir. + -2012-04-28 Glenn Morris - + * faq.texi: Convert @inforefs to @xrefs. + Fix some malformed cross-references. + (File-name conventions): Shorten section name to avoid overfull line. + (How to add fonts): Use smallexample to avoid overfull lines. + -2012-04-26 Ippei Furuhashi (tiny change) +2012-05-01 Teodor Zlatanov + + * auth.texi (Help for users): Update for .gpg file being second. + +2012-04-27 Ippei Furuhashi (tiny change) * org.texi (Agenda commands): Fix two typos: give corresponding function names, according to `org-agenda-view-mode-dispatch'. diff --cc lisp/ChangeLog index 07505a32536,ae273d9d610..e144bf1507e --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,103 -1,20 +1,118 @@@ -2012-04-30 Eli Zaretskii ++2012-05-02 Eli Zaretskii + + * mail/rmail.el (rmail-yank-current-message): Use the encoding of + the yanked message in preference to the default value of + buffer-file-coding-system. + -2012-04-30 Martin Rudalics ++2012-05-02 Martin Rudalics + + * window.el (display-buffer--action-function-custom-type): Fix + entry. + -2012-04-27 Alan Mackenzie ++2012-05-02 Alan Mackenzie + + * progmodes/cc-defs.el (c-version): Update to 5.32.3. + +2012-05-01 Glenn Morris + + * cus-start.el (suggest-key-bindings): Remove, now it is in Lisp. + + * eshell/esh-cmd.el (eshell-debug-command): Doc fix. Add :set. + + * cus-edit.el (custom-variable-documentation): Simplify with format. + +2012-05-01 Aaron S. Hawley + Stefan Monnier + + * simple.el (suggest-key-bindings, execute-extended-command): + Move from keyboard.c. + +2012-05-01 Chong Yidong + + * follow.el: Eliminate advice. + (set-process-filter, process-filter, sit-for): Advice deleted. + (follow-mode-off-hook): Obsolete hook removed. + (follow-avoid-tail-recenter-p, follow-process-filter-alist): + Vars deleted. + (follow-auto): Use a :set function. + (follow-mode): Rewritten. Don't advise process filters. + (follow-switch-to-current-buffer-all, follow-scroll-up) + (follow-scroll-down): Assume follow-mode is bound. + (follow-comint-scroll-to-bottom) + (follow-align-compilation-windows): New functions. + (follow--window-sorter): New function. + (follow-all-followers): Use it to explicitly sort windows by their + positions; don't make assumptions about next-window order. + (follow-windows-start-end, follow-delete-other-windows-and-split) + (follow-calc-win-start): Doc fix. + (follow-windows-aligned-p, follow-select-if-visible): Don't call + vertical-motion unnecessarily. + (follow-adjust-window): New function. + (follow-post-command-hook): Use it. + (follow-call-set-process-filter, follow-call-process-filter) + (follow-intercept-process-output, follow-tidy-process-filter-alist) + (follow-stop-intercept-process-output, follow-generic-filter): + Functions deleted. + (follow-scroll-bar-toolkit-scroll, follow-scroll-bar-drag) + (follow-scroll-bar-scroll-up, follow-scroll-bar-scroll-down): + New functions, replacing advice on scroll-bar-* commands. + (follow-mwheel-scroll): New function (Bug#4112). + + * comint.el (comint-adjust-point): New function. + (comint-postoutput-scroll-to-bottom): Use it. + Call follow-comint-scroll-to-bottom for Follow mode buffers. + +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 + 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 + read-only error. + +2012-04-29 Chong Yidong + + * follow.el (follow-calc-win-end): Rewrite to handle partial + screen lines correctly (Bug#8390). + (follow-avoid-tail-recenter): Minor cleanup. + +2012-04-28 Stefan Monnier + + Avoid the obsolete `assoc' package. + * speedbar.el (speedbar-refresh): Avoid adelete. + (speedbar-file-lists): Simplify and avoid aput. + * man.el (Man--sections, Man--refpages): New vars, replacing + Man-sections-alist and Man-refpages-alist. + (Man-build-section-alist, Man-build-references-alist): + Use them; avoid aput. + (Man--last-section, Man--last-refpage): New vars. + (Man-follow-manual-reference): Use them. + Use the `default' arg of completing-read. + (Man-goto-section): Idem. Move prompt to the `interactive' spec. + 2012-04-27 Chong Yidong + * vc/diff.el (diff-sentinel): Go to bob (Bug#10259). + + * startup.el (x-apply-session-resources): New function. + + * term/ns-win.el (ns-initialize-window-system): + * term/w32-win.el (w32-initialize-window-system): + * term/x-win.el (x-initialize-window-system): Use it to properly + set menu-bar-mode and other vars from X resources, even if the + initial frame is not a window-system frame (Bug#2299). + * subr.el (read-key): Avoid running filter function when setting up temporary tool bar entries (Bug#9922). diff --cc src/ChangeLog index f624517efb2,e2eb95f60d0..fb5cab2ac3c --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,39 -1,11 +1,46 @@@ -2012-04-29 Eli Zaretskii ++2012-05-02 Eli Zaretskii + + * xdisp.c (pos_visible_p): If already at a newline from the + display string before the 'while' loop, don't walk back the glyphs + from it3.glyph_row. Solves assertion violation when the display + string begins with a newline (egg.el). (Bug#11367) + -2012-04-24 Chong Yidong +2012-05-01 Stefan Monnier + + * keyboard.c (Fexecute_extended_command, Vsuggest_key_bindings): + Move to simple.el. + +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. + + * 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 + + * .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). + * buffer.c (Fmove_overlay): Revert the change of 2012-04-23. + That is, do not delete an evaporating overlay if it becomes + empty after its bounds are adjusted to fit within its buffer. + This fix caused other problems, and I'm reverting it until we get + to the bottom of them. + +2012-04-27 Chong Yidong * xselect.c (x_convert_selection): Initialize a pointer (Bug#11315).