From: Paul Eggert Date: Thu, 1 Jan 2015 18:47:17 +0000 (-0800) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2612^2~6 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ddd819467d1d9d0e78f13e5a15c1af9125ae67b;p=emacs.git Merge from origin/emacs-24 a5f90a3 * .gitattributes: New file. 5a9710f Make sure tool-bar changes are reflected on display. 93796ba * autogen.sh: Port better to non-GNU 'cp'. 9758516 Fix a typo in a comment in the previous commit. aa472a3 Fix the pixel coordinates returned by pos-visible-in-window-p. (Bug#19473) d261229 * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p): New defun. (tramp-test30-special-characters): Use it. (tramp--test-check-files): Filter nil file names out. 9278f05 Omit trailing white space 1c93fd3 Sync with Tramp 2.2.11. 96ebe18 Sync with Tramp 2.2.11. e792450 Sync with Tramp 2.2.11. 2d17e12 Fix ChangeLog entry. 6444482 Fix auto-revert-tail-mode for remote files b5c9c13 Spelling fixes c5504d1 src/w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458) Conflicts: ChangeLog doc/misc/ChangeLog lisp/ChangeLog src/ChangeLog test/ChangeLog --- 6ddd819467d1d9d0e78f13e5a15c1af9125ae67b diff --cc ChangeLog index ad3630c4a99,5ae8b636328..f04b60ef537 --- a/ChangeLog +++ b/ChangeLog @@@ -1,46 -1,12 +1,55 @@@ + 2015-01-01 Paul Eggert + + * .gitattributes: New file. + -2014-12-31 Paul Eggert ++2015-01-01 Paul Eggert + + * autogen.sh: Port better to non-GNU 'cp'. + Problem reported by Han Boetes. + +2014-12-31 Paul Eggert + + Less 'make' chatter at top level + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0) + (am__v_at_1): New macros, copied from src/Makefile.in. + ($(srcdir)/src/config.in, ${srcdir}/info/dir): + Be less chatty when not verbose. + ($(srcdir)/src/stamp-h.in): Simplify with '$@'. + +2014-12-29 Paul Eggert + + system-name's returned value can vary + Also, the system-name variable is now obsolete. + Fixes Bug#19438. + * doc/lispref/os.texi (System Environment): + * etc/NEWS: Document this. + * doc/misc/efaq.texi: + (Displaying the current file name in the titlebar): + * lisp/desktop.el (desktop-save-frameset): + * lisp/dnd.el (dnd-get-local-file-uri): + * lisp/gnus/message.el (message-make-fqdn): + * lisp/gnus/nnvirtual.el (nnvirtual-retrieve-headers) + (nnvirtual-update-xref-header): + * lisp/nxml/rng-uri.el (rng-uri-file-name-1): + * lisp/org/org-clock.el (org-clock-save): + * src/filelock.c (current_lock_owner): + * src/xrdb.c (get_environ_db): + * src/xterm.c (same_x_server): + * src/xterm.c (x_term_init): + Prefer (system-name) to system-name, and avoid naming + locals 'system-name'. + * doc/misc/smtpmail.texi (Server workarounds): Fix grammar. + * lisp/startup.el (system-name): Now an obsolete variable. + * src/editfns.c (cached_system_name): New static var. + (init_and_cache_system_name): New function. + (init_editfns, Fsystem_name): Use it. + (syms_of_editfns): Initialize it and Vsystem_name to the same value. + * src/sysdep.c [HAVE_SOCKETS]: Don't include , . + (h_errno) [TRY_AGAIN && !HAVE_H_ERRNO]: Remove decl. + (init_system_name) [HAVE_SOCKETS]: Don't canonicalize the name. + Don't create a new string if the current value is already correct. + 2014-12-28 Paul Eggert * build-aux/git-hooks/commit-msg: Allow tabs. diff --cc doc/misc/ChangeLog index 285d5b32a88,c59077cb857..3ae626f49ef --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,71 -1,16 +1,76 @@@ -2014-12-29 Michael Albinus ++2015-01-01 Michael Albinus + + Sync with Tramp 2.2.11. - + * trampver.texi: Update release number. + -2014-11-10 Tassilo Horn +2014-12-31 Paul Eggert - * gnus.texi (HTML): Update section so that it mentions shr and w3m. - Also link the full EWW manual that explains more on shr, too. + Less 'make' chatter for Emacs doc + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. + (ENVADD, $(buildinfodir)/%.info, %.html, ${buildinfodir}/ccmode.info) + (${buildinfodir}/efaq%.info, efaq%.html): + Use them. - * gnus-faq.texi (FAQ 4 - Reading messages, FAQ 4-16): Add Q&A on how to - increase contrast when displaying HTML mail with shr. +2014-12-18 Eric Abrahamsen + + * gnus.texi (Gnus Registry Setup): Explain pruning changes. Mention + gnus-registry-prune-factor. Explain sorting changes and + gnus-registry-default-sort-function. Correct file extension. + +2014-12-17 Jay Belanger + + * calc.texi (About This Manual): Update instructions + for building the manual. + +2014-12-15 Alan Mackenzie + + "Advice" is a mass noun. Amend text accordingly. + * cl.texi (Obsolete Macros): Replace "an advice" with "advice". + +2014-12-12 Paul Eggert + + * texinfo.tex: Update from gnulib. + +2014-12-08 Andrey Kotlarski + + * eww.texi (Basics): Document managing multiple eww buffers. + +2014-12-05 Lars Magne Ingebrigtsen + + * eww.texi (Basics): Document eww PDF viewing. + +2014-11-23 Ivan Shmakov + + * eww.texi (Advanced): Mention the Desktop stuff (bug#18010). + +2014-11-23 Michael Albinus + + * tramp.texi (Remote processes): Let-bind environment variables to + `process-environment' when running `process-file' or + `start-file-process'. + +2014-11-19 Ivan Shmakov + + * eww.texi (Basics): Document `eww-history-limit'. + +2014-11-14 Paul Eggert + + * org.texi (The date/time prompt, Matching tags and properties): + Use leading zero with 24-hour times less than 10:00. + +2014-11-13 Lars Magne Ingebrigtsen + + * eww.texi (Variable Index): Mention `eww-after-render-hook'. + +2014-11-10 Lars Magne Ingebrigtsen + + * eww.texi (Basics): Document `eww-readable'. + +2014-11-10 Katsumi Yamaoka + + * gnus.texi (Top): Add missing `HTML' menu. + (HTML): Fix xref to FAQ 4-16. 2014-11-09 Glenn Morris diff --cc lisp/ChangeLog index 7620a0730a6,135ee4749dc..9d5416c5cea --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,95 -1,26 +1,118 @@@ + 2015-01-01 Eli Zaretskii + + * tool-bar.el (tool-bar-local-item) + (tool-bar-local-item-from-menu): Call force-mode-line-update to + make sure the tool-bar changes show on display. + -2014-12-29 Michael Albinus ++2015-01-01 Michael Albinus + + Sync with Tramp 2.2.11. + + * net/tramp-compat.el (top): Require cl-macs for Emacs 22. + Make an alias for `default-toplevel-value' if it doesn't exist. + + * net/tramp-smb.el (tramp-smb-handle-copy-directory): + Use `tramp-compat-delete-directory'. + + * net/trampver.el: Update release number. + -2014-12-29 Filipp Gunbin ++2015-01-01 Filipp Gunbin + + * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode + for remote files. (Bug#19449) + +2015-01-01 Simen Heggestøyl (tiny change) + + * textmodes/css-mode.el (scss-mode): Fix typo (bug#19446). + +2014-12-31 Paul Eggert + + Less 'make' chatter in lisp directory + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../src/Makefile.in. + (custom-deps, finder-data, autoloads, update-subdirs): Use them. + +2014-12-31 Filipp Gunbin + + * info.el (info-display-manual): Limit the completion alternatives + to currently visited manuals if prefix argument is non-nil. + +2014-12-30 Paul Eggert + + * Makefile.in (semantic): Simplify. + +2014-12-30 Juri Linkov + + * net/eww.el (eww-isearch-next-buffer): New function. + (eww-mode): Set multi-isearch-next-buffer-function to it. + +2014-12-30 Dmitry Gutov + + * progmodes/xref.el (xref-find-definitions): Mention "no + identifier at point" case in the docstring. + + * menu-bar.el (menu-bar-goto-uses-etags-p): New function. + (menu-bar-goto-menu): Use it to show or hide the `set-tags-name' + and `separator-tag-file' items. + +2014-12-29 Paul Eggert + + * obsolete/pc-select.el (pc-selection-mode): Use system-type. + This is instead of system-name, which is both wrong here and obsolete. + +2014-12-29 Dmitry Gutov + + * menu-bar.el (menu-bar-next-tag-other-window) + (menu-bar-next-tag): Remove. + +2014-12-29 K. Handa + + * international/mule.el (make-translation-table-from-alist): + Accept nil or zero-length vector for FROM and TO. + +2014-12-29 Lars Ingebrigtsen + + * net/eww.el (eww-mode): Truncate overlong lines for prettier + display when resizing. + + * net/shr.el (shr-width): Default to using the window width when + rendering. + +2014-12-29 Dmitry Gutov + + Unbreak jumping to an alias's definition. + + * emacs-lisp/find-func.el (find-function-library): Return a pair + (ORIG-FUNCTION . LIBRARY) instead of just its second element. + (find-function-noselect): Use it. + + * progmodes/elisp-mode.el (elisp--xref-identifier-file): Rename to + `elisp--xref-identifier-location', incorporate logic from + `elisp--xref-find-definitions', use the changed + `find-function-library' return value. + +2014-12-29 Juri Linkov + + * comint.el (comint-history-isearch-message): Use field-beginning + instead of comint-line-beginning-position - that's more fixes for + http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00305.html + (comint-history-isearch-message): Fix args of isearch-message-prefix. + +2014-12-29 Juri Linkov + + * vc/vc-dir.el (vc-dir-display-file): New command (bug#19450). + (vc-dir-mode-map): Bind it to "\C-o". + (vc-dir-menu-map): Add it to menu. + +2014-12-29 Dmitry Gutov + + * progmodes/etags.el (find-tag-other-window) + (find-tag-other-frame, find-tag-regexp, tags-loop-continue) + (tags-apropos): Declare obsolete. + + * menu-bar.el (menu-bar-goto-menu): Replace all but one etags item + with xref ones. + 2014-12-28 Eli Zaretskii * international/mule.el (define-coding-system): Fix typos in the diff --cc src/ChangeLog index 85eb113db82,21303f27654..2cf21c9b4ad --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,39 -1,14 +1,48 @@@ -2014-12-30 Eli Zaretskii ++2015-01-01 Eli Zaretskii + + * xdisp.c (pos_visible_p): Fix up the X coordinate for + right-to-left screen lines. (Bug#19473) + -2014-12-28 Eli Zaretskii ++2015-01-01 Eli Zaretskii + + * w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458) + +2014-12-31 Paul Eggert + + Simplify setfattr use by assuming GNU make + * Makefile.in (PAXCTL_if_present, SETFATTR_if_present): New macros. + (emacs$(EXEEXT), temacs$(EXEEXT), bootstrap-emacs$(EXEEXT)): Use them. + Simplify by using GNU make rather than shell conditionals, + by using ln -f rather than rm -f followed by ln, + and by preferring $@ to spelling out the destination. + +2014-12-29 Eli Zaretskii + + * sysdep.c [WINDOWSNT]: Include sys/socket.h, without which this + file doesn't compile on MS-Windows. + +2014-12-28 Paul Eggert + + Fix produce_composite_width typo + * term.c (produce_composite_glyph): + Fix typo that confused number of columns for pixel width. + 2014-12-28 Paul Eggert + Wrap dll functions more simply + * decompress.c, gnutls.c, image.c, xml.c: + If WINDOWSNT, use '#define FOO fn_FOO' to wrap dll functions, + rather than the inverse when not WINDOWSNT. This isolates the + fn_* business into the WINDOWSNT-specific section of the code, + which makes it easier to maintain the generic code. + * decompress.c (DEF_ZLIB_FN, LOAD_ZLIB_FN): + * gnutls.c (DEF_GNUTLS_FN, LOAD_GNUTLS_FN): + * image.c (DEF_IMGLIB_FN, LOAD_IMGLIB_FN): + * xml.c (DEF_XML2_FN, LOAD_XML2_FN): + Remove. All uses replaced by DEF_DLL_FN. + * decompress.c (inflateInit2): Remove; no longer needed. + * w32.h (DEF_DLL_FN, LOAD_DLL_FN): New macros. + Port memory-full checking to GnuTLS 3.3 Instead of using gnutls_global_set_mem_functions, check every call to a GnuTLS function that might return an indication of memory diff --cc test/ChangeLog index 2ea325432d0,720f60bb7e6..b376bd45d9d --- a/test/ChangeLog +++ b/test/ChangeLog @@@ -1,22 -1,20 +1,36 @@@ -2014-12-30 Michael Albinus ++2015-01-01 Michael Albinus + + * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p): + New defun. + (tramp-test30-special-characters): Use it. (Bug#19463) + (tramp--test-check-files): Filter nil file names out. + -2014-12-29 Michael Albinus ++2015-01-01 Michael Albinus + + Sync with Tramp 2.2.11. + + * automated/tramp-tests.el (tramp-test30-special-characters): + Skip test on MS-Windows. + +2014-12-27 Glenn Morris + + * automated/let-alist.el: Load dependency. + +2014-12-27 Fabián Ezequiel Gallina + + * automated/python-tests.el + (python-shell-completion-native-interpreter-disabled-p-1): New + test. + +2014-12-27 Fabián Ezequiel Gallina + + * automated/python-tests.el (python-shell-get-or-create-process-1) + (python-shell-get-or-create-process-2) + (python-shell-get-or-create-process-3): Remove tests. + 2014-12-27 Fabián Ezequiel Gallina - (python-shell-buffer-substring-9): New test. + * automated/python-tests.el (python-shell-buffer-substring-9): New test. 2014-12-27 Fabián Ezequiel Gallina