From: Chong Yidong Date: Mon, 14 May 2012 11:59:28 +0000 (+0800) Subject: Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd@gnu.org X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/e18afed7d695edac870ddf55aabc85c0a95a4b5f Merge from emacs-24; up to 2012-04-22T13:58:00Z!cyd@gnu.org --- e18afed7d695edac870ddf55aabc85c0a95a4b5f diff --cc doc/misc/ChangeLog index 915e85a3e6,99c14897db..812ec0214b --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,39 -1,12 +1,46 @@@ + 2012-05-12 Andreas Schwab + + * cc-mode.texi: Avoid space before macro in 4th argument of cross + reference commands. (Bug#11461) + + * Makefile.in (gnus.dvi): Use $@ instead of $*.dvi. + +2012-05-12 Glenn Morris + + * Makefile.in (mostlyclean): Add more TeX intermediates. + + * Makefile.in: Make it look more like the other doc Makefiles. + Use explicit $srcdir in all dependencies. + Remove cd $srcdir from rules. + (VPATH): Remove. + (infodir): Set to an absolute path. + (INFO_TARGETS): Use short names. + (mkinfodir): infodir is now absolute. + (echo-info, maintainer-clean): Update for new format of INFO_TARGETS. + + * Makefile.in (info.info): Rename from info, to avoid duplication. + (.SUFFIXES): Disable implicit rules. + + * Makefile.in (MKDIR_P): New, set by configure. + (mkinfodir): Use $MKDIR_P. + +2012-05-07 Glenn Morris + + * forms.texi (Long Example): Update for changed location of files. + +2012-05-04 Glenn Morris + + * Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure. + (INFO_TARGETS): Use $INFO_EXT. + Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o. + * makefile.w32-in (INFO_EXT, INFO_OPTS): New. + (INFO_TARGETS): Use $INFO_EXT. + Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o. + 2012-05-02 Glenn Morris + * Makefile.in (echo-info): New phony target, used by top-level. + * viper.texi: Make direntry shorter (also it is no longer "newest"). * emacs-gnutls.texi, ert.texi, org.texi: diff --cc doc/misc/Makefile.in index 0c0a4e07b6,e387631ba7..c3bbfbb02a --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@@ -408,16 -447,16 +408,16 @@@ forms.pdf: ${srcdir}/forms.tex $(ENVADD) $(TEXI2PDF) ${srcdir}/forms.texi # gnus/message/emacs-mime/sieve/pgg are part of Gnus: -gnus : $(infodir)/gnus -$(infodir)/gnus: gnus.texi gnus-faq.texi +gnus : $(infodir)/gnus$(INFO_EXT) +$(infodir)/gnus$(INFO_EXT): ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi $(mkinfodir) - cd $(srcdir); $(MAKEINFO) $(MAKEINFO_OPTS) gnus.texi -gnus.dvi: ${srcdir}/gnus.texi gnus-faq.texi + $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ ${srcdir}/gnus.texi +gnus.dvi: ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi $(ENVADD) $(TEXI2DVI) gnustmp.texi - cp gnustmp.dvi $*.dvi + cp gnustmp.dvi $@ rm gnustmp.* -gnus.pdf: ${srcdir}/gnus.texi gnus-faq.texi +gnus.pdf: ${srcdir}/gnus.texi ${srcdir}/gnus-faq.texi sed -e '/@iflatex/,/@end iflatex/d' ${srcdir}/gnus.texi > gnustmp.texi $(ENVADD) $(TEXI2PDF) gnustmp.texi cp gnustmp.pdf $@ diff --cc lisp/ChangeLog index 75fc7f5884,93127c4378..b833e61bfa --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,160 -1,26 +1,182 @@@ -2012-05-06 Troels Nielsen (tiny change) ++2012-05-14 Troels Nielsen (tiny change) + + * progmodes/compile.el (compilation-internal-error-properties): + Calculate start position correctly when end-col is set but + end-line is not (Bug#11382). + -2012-05-11 Stefan Monnier ++2012-05-14 Stefan Monnier + + * net/rlogin.el (rlogin-mode-map): Fix last change. + -2012-05-09 Jason L. Wright (tiny change) ++2012-05-14 Jason L. Wright (tiny change) + + * mail/smtpmail.el (smtpmail-send-command): Send the command and + the following \r\n using a single `process-send-string', since the + Lotus SMTP server refuses to accept any commands if they are sent - with two `process-send-string's (bug#11444). ++ with two `process-send-string's (Bug#11444). + -2012-05-09 Stefan Monnier ++2012-05-14 Stefan Monnier + + * shell.el (shell-parse-pcomplete-arguments): Obey - pcomplete-arg-quote-list inside double-quoted args as well (bug#11348). ++ pcomplete-arg-quote-list inside double-quoted args (Bug#11348). ++ +2012-05-14 Wolfgang Jenkner + - * image-mode.el: Fit to width/height for rotated images (bug#11431). ++ * image-mode.el: Fit to width/height for rotated images (Bug#11431). + (image-transform-scale, image-transform-right-angle-fudge): New vars. + (image-transform-width, image-transform-fit-width): New functions. + (image-transform-properties): Use them. + (image-transform-check-size): New function. + (image-toggle-display-image): Use it (for testing). + (image-transform-set-rotation): Reduce angle mod 360. + Delete obsolete comment. + +2012-05-14 Wolfgang Jenkner + + * image-mode.el: Fix scaling (bug#11399). + (image-transform-resize): Doc fix. + (image-transform-properties): Default scale is 1 and height should + be an integer. + +2012-05-13 Johan Bockgård + + * emacs-lisp/smie.el (smie-next-sexp): Use accessor `op-forw' rather + than hard-coding `car', to fix misbehavior when moving forward. + +2012-05-13 Chong Yidong + + * emacs-lisp/tabulated-list.el (tabulated-list-format) + (tabulated-list-entries, tabulated-list-padding) + (tabulated-list-sort-key): Make permanent-local. + + * ebuff-menu.el: Adapt to Buffer Menu changes (Bug#11455). + (electric-buffer-list): Put electric buffer menu + command descriptions in this docstring, instead of the docstring + of electric-buffer-menu-mode. Code cleanups. + (electric-buffer-menu-mode): Use define-derived-mode. Rename from + Electric-buffer-menu-mode. + (electric-buffer-update-highlight): Minor code cleanup. + +2012-05-13 Michael Albinus + + * net/dbus.el (dbus-call-method): Restore events not from D-Bus. + (Bug#11447) + +2012-05-13 Stefan Monnier + + Move define-obsolete-variable-alias before the var's definition. + * vc/log-edit.el (vc-comment-ring, vc-comment-ring-index): + * tooltip.el (tooltip-hook): + * textmodes/reftex-toc.el (reftex-toc-map): + * textmodes/reftex-sel.el (reftex-select-label-map) + (reftex-select-bib-map): + * textmodes/reftex-index.el (reftex-index-map) + (reftex-index-phrases-map): + * speedbar.el (speedbar-syntax-table, speedbar-key-map): + * progmodes/meta-mode.el (meta-mode-map): + * novice.el (disabled-command-hook): + * loadhist.el (unload-hook-features-list): + * frame.el (blink-cursor): + * files.el (find-file-not-found-hooks, write-file-hooks) + (write-contents-hooks): + * emulation/tpu-edt.el (GOLD-map): + * emacs-lock.el (emacs-lock-from-exiting): + * emacs-lisp/generic.el (generic-font-lock-defaults): + * emacs-lisp/chart.el (chart-map): + * dos-fns.el (register-name-alist): + * dired-x.el (dired-omit-files-p): + * desktop.el (desktop-enable): + * cus-edit.el (custom-mode-hook): + * buff-menu.el (buffer-menu-mode-hook): + * bookmark.el (bookmark-read-annotation-text-func) + (bookmark-exit-hooks): + * allout.el (allout-mode-deactivate-hook) + (allout-exposure-change-hook, allout-structure-added-hook) + (allout-structure-deleted-hook, allout-structure-shifted-hook): + * dirtrack.el (dirtrack-toggle, dirtrackp, dirtrack-debug-toggle) + (dirtrack-debug): Move call to define-obsolete-variable-alias so it + comes before the corresponding variable's definition. + +2012-05-12 Chong Yidong + + * buff-menu.el (Buffer-menu-buffer+size-width): Doc fix (Bug#11454). + (Buffer-menu-mouse-select): Restore function (Bug#11459). + (Buffer-menu-mode-map): Bind it. + (Buffer-menu--pretty-name): Add a mouse-face property. -2012-05-08 Stefan Monnier +2012-05-11 Stefan Monnier + + * progmodes/prolog.el: Use SMIE. Cleanup regexp setup. + (prolog-upper-case-string, prolog-lower-case-string) + (prolog-atom-char-regexp, prolog-atom-regexp): Initialize in defconst. + (prolog-use-smie, prolog-smie-grammar): New vars. + (prolog-smie-forward-token, prolog-smie-backward-token) + (prolog-smie-rules): New funs. + (prolog-comment-indent): Remove. + (prolog-mode-variables): Use default comment indentation instead. + Setup SMIE. + (prolog-build-case-strings, prolog-set-atom-regexps): Remove. + (prolog-mode): Don't call them any more. + (prolog-electric-colon, prolog-electric-dash) + (prolog-edit-menu-insert-move): Use indent-according-to-mode. + + * dabbrev.el (dabbrev-expand): Make "no expansion found" a user-error. + + * minibuffer.el (completion--twq-all): Again, allow case differences. + + * term.el: Move keymap initialization code to be more idiomatic. + (term-signals-menu, term-mode-map, term-raw-map, term-raw-escape-map) + (term-terminal-menu): Move initialization into declaration. + (term-escape-char): Let the user set it in her .emacs. + + * progmodes/sh-script.el: Use post-self-insert-hook&electric-pair-mode. + Provide SMIE-based indentation (not enabled by default yet). + (sh-mode-map): Don't bind electric keys. + Use electric-pair-mode instead of skeleton-pair. + (sh-assignment-regexp): Fit within 80 columns. + (sh-indent-supported): Specify actual shell name instead of boolean. + (sh--maybe-here-document): New fun, from sh-maybe-here-document. + (sh-maybe-here-document): Use it. Make obsolete. + (sh-electric-here-document-mode) New minor mode. + (sh-mode): Use it. Don't set sh-indent-supported-here here. + (sh-smie-sh-grammar, sh-smie--sh-operators, sh-smie--sh-operators-re) + (sh-smie--sh-operators-back-re, sh-indent-after-continuation) + (sh-smie-rc-grammar, sh-use-smie): New vars. + (sh-smie--keyword-p, sh-smie--newline-semi-p, sh-smie--sh-keyword-p) + (sh-smie-sh-forward-token, sh-smie--looking-back-at-continuation-p) + (sh-smie-sh-backward-token, sh-smie--continuation-start-indent) + (sh-smie-sh-rules, sh-smie-rc-rules, sh-smie--sh-keyword-in-p) + (sh-smie--rc-after-special-arg-p, sh-smie-rc-backward-token) + (sh-smie-sh-rules, sh-smie--rc-newline-semi-p): New functions. + (sh-set-shell): Use smie-setup if requested. + + * term.el (term-set-escape-char): Properly set term-escape-char. + See http://stackoverflow.com/questions/10524656. + +2012-05-10 Chong Yidong + + * ffap.el (ffap-url-unwrap-local): Make it work right (Bug#9131). + Use url-generic-parse-url, and handle host names and Windows + filenames properly. + (ffap-url-unwrap-remote): Use url-generic-parse-url. + (ffap-url-unwrap-remote): Accept list values, specifying a list of + URL schemes to work on. + (ffap--toggle-read-only): New function. + (ffap-read-only, ffap-read-only-other-window) + (ffap-read-only-other-frame): Use it. + (ffap-fixup-url): Don't check ffap-ftp-regexp, since it is not + necessary for ffap-url-unwrap-remote. + +2012-05-10 Dave Abrahams + + * cus-start.el (create-lockfiles): Add it. + +2012-05-09 Chong Yidong + + * net/browse-url.el (browse-url-url-encode-chars): Use upper-case. + (browse-url-encode-url): Encode spaces and quotes (Bug#6300). + +2012-05-09 Stefan Monnier * shell.el (shell-completion-vars): Fix last change (bug#11348). diff --cc src/ChangeLog index 8b29c10c38,2f3643f4f8..3f9d575dce --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,77 -1,39 +1,112 @@@ -2012-05-13 Eli Zaretskii ++2012-05-14 Eli Zaretskii + + * xdisp.c (handle_stop): Don't call get_overlay_strings_1 if we + already have overlays loaded. + (handle_single_display_spec): Before returning without displaying + fringe bitmap, synchronize the bidi iterator with the main display + iterator, by calling iterate_out_of_display_property. + (iterate_out_of_display_property): Detect buffer iteration by + testing that it->string is a Lisp string. + (get_next_display_element): When the current object is exhausted, + and there's something on it->stack, call set_iterator_to_next to + proceed with what's on the stack, instead of returning zero. + (set_iterator_to_next): If called at the end of a Lisp string, + proceed to consider_string_end without incrementing string + position. Don't increment display vector index past the end of + the display vector. (Bug#11417) + (pos_visible_p): Don't report a position visible when move_it_to + stopped at the last line of window, which happens to be scanned + backwards by the bidi iteration. (Bug#11464) + -2012-05-11 Eli Zaretskii ++2012-05-14 Eli Zaretskii + + * xdisp.c (handle_single_display_spec): Return 1 for left-margin + and right-margin display specs even if the spec is invalid or we + are on a TTY, and thus unable to display on the fringes. That's + because the text with the property will not be displayed anyway, + so we need to signal to the caller that this is a "replacing" + display spec. This fixes display when the spec is invalid or we + are on a TTY. + -2012-05-09 Paul Eggert ++2012-05-14 Paul Eggert + + * unexaix.c (make_hdr): Fix typo in prototype. + This bug broke the build on AIX. Problem reported by Gilles Pion. + -2012-05-05 Eli Zaretskii +2012-05-14 Michael Albinus + + * keyboard.c (kbd_buffer_get_event): Read special events also in + batch mode. (Bug#11415) + +2012-05-12 Glenn Morris + + * ns.mk: Update for ns_appbindir no longer having trailing "/". + +2012-05-12 Eli Zaretskii + + * lisp.mk (lisp): Add newcomment.elc. + +2012-05-12 Glenn Morris + + * Makefile.in (MKDIR_P): New, set by configure. + * ns.mk (${ns_appdir}, ${ns_appbindir}Emacs): Use $MKDIR_P. + +2012-05-11 Paul Eggert + + Remove unused function hourglass_started. + * dispextern.h (hourglass_started): + * w32fns.c (hourglass_started): + * xdisp.c (hourglass_started): Remove. + +2012-05-10 Juanma Barranquero + + * makefile.w32-in ($(BLD)/gmalloc.$(O), $(BLD)/w32menu.$(O)): + Update dependencies. + +2012-05-10 Paul Eggert + + * xgselect.c (xg_select): Put maxfds+1 into a var. + This is slightly clearer, and pacifies Ubuntu 12.04 gcc. + + * sound.c (DEFAULT_ALSA_SOUND_DEVICE): Define only if HAVE_ALSA. + +2012-05-10 Dave Abrahams + + * filelock.c (syms_of_filelock): New boolean create-lockfiles. + (lock_file): If create_lockfiles is 0, do nothing. (Bug#11227) + +2012-05-09 Michael Albinus + + * dbusbind.c (xd_registered_buses): New internal Lisp object. + Rename all occurences of Vdbus_registered_buses to xd_registered_buses. + (syms_of_dbusbind): Remove declaration of Vdbus_registered_buses. + Initialize xd_registered_buses. + +2012-05-09 Paul Eggert + + Untag more efficiently if USE_LSB_TAG. + This is based on a proposal by YAMAMOTO Mitsuharu in + . + For an admittedly artificial (nth 8000 longlist) benchmark on + Fedora 15 x86-64, this yields a 25% CPU speedup. Also, it shrinks + Emacs's overall text size by 1%. + * lisp.h (XUNTAG): New macro. + (XCONS, XVECTOR, XSTRING, XSYMBOL, XFLOAT, XMISC, XPROCESS, XWINDOW) + (XTERMINAL, XSUBR, XBUFFER, XCHAR_TABLE, XSUB_CHAR_TABLE, XBOOL_VECTOR) + (XSETTYPED_PSEUDOVECTOR, XHASH_TABLE, TYPED_PSEUDOVECTORP): Use it. + * eval.c (Fautoload): + * font.h (XFONT_SPEC, XFONT_ENTITY, XFONT_OBJECT): + * frame.h (XFRAME): Use XUNTAG. + + Port recent dbusbind.c changes to 32-bit --with-wide-int. + * dbusbind.c (xd_append_arg, xd_retrieve_arg, Fdbus_message_internal): + Remove unportable assumptions about print widths of types like + dbus_uint32_t. + (xd_get_connection_address, Fdbus_init_bus): Cast Emacs integer to + intptr_t when converting between pointer and integer, to avoid GCC + warnings about wrong width. + +2012-05-09 Eli Zaretskii * w32proc.c (new_child): Force Windows to reserve only 64KB of stack for each reader_thread, instead of defaulting to 8MB