From: Glenn Morris Date: Wed, 5 Nov 2014 05:08:57 +0000 (-0800) Subject: Merge from emacs-24; up to 117669 X-Git-Tag: emacs-25.0.90~2635^2~566 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934;p=emacs.git Merge from emacs-24; up to 117669 --- b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934 diff --cc lisp/ChangeLog index 4684c017d94,bad4def88f2..dc17f8e3ffb --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,39 -1,19 +1,55 @@@ -2014-11-04 Eli Zaretskii ++2014-11-05 Eli Zaretskii + + * jit-lock.el (jit-lock-stealth-fontify): Be tolerant to nil being + returned by load-average. + -2014-11-04 Michael Albinus ++2014-11-05 Michael Albinus + + * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Don't use + a local copy; setting `inhibit-file-name-handlers' proper might be + more performant. (Bug#18751) + -2014-11-04 Glenn Morris ++2014-11-05 Glenn Morris + + * mail/emacsbug.el (report-emacs-bug): No longer include + recent-keys in the report. (Bug#18900) + +2014-11-04 Paul Eggert + + * mouse.el (mouse-drag-line): Fix misspelling of "right-fringe". + +2014-11-04 Teodor Zlatanov + + * net/eww.el (eww): Trim URL with `string-trim'. + Suggested by Vibhav Pant . + +2014-11-03 Lars Magne Ingebrigtsen + + * net/eww.el (eww-score-readability): Don't count comments positively. + + * net/shr.el (shr-retransform-dom): Typo fix. + + * net/eww.el (eww-score-readability): Parse SVC images correctly. + (eww-display-html): Don't leave point inside forms. + + * net/shr.el: Ditto. + +2014-11-03 Stefan Monnier + + * emacs-lisp/edebug.el (edebug-safe-prin1-to-string): Assume that + edebug-prin1-to-string already handles circularity. + + * emacs-lisp/byte-run.el (defun-declarations-alist): Fix compiler-macro + autoloading when specified as a lambda. + + * simple.el (execute-extended-command--last-typed): New var. + (read-extended-command): Set it. + Don't complete obsolete commands. + (execute-extended-command--shorter-1) + (execute-extended-command--shorter): New functions. + (execute-extended-command): Use them to suggest shorter names. + (indicate-copied-region, deactivate-mark): Use region-active-p. + 2014-11-03 Michael Albinus * net/tramp-sh.el (tramp-do-copy-or-rename-file-via-buffer): Use a diff --cc lisp/erc/ChangeLog index 75a01581fcd,869befc1191..0875994e775 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@@ -1,48 -1,12 +1,52 @@@ -2014-11-04 Stefan Monnier ++2014-11-05 Stefan Monnier + + * erc.el (erc-send-input): Bind `str' dynamically (bug#18936). + +2014-10-29 Paul Eggert + + Simplify use of current-time and friends. + * erc-backend.el (TOPIC): Omit unnecessary call to current-time. + * erc.el (erc-emacs-time-to-erc-time): Simplify by using float-time. + (erc-current-time): Simplify by using erc-emacs-time-to-erc-time. + 2014-10-20 Glenn Morris - * Version 24.4 released. + * Merge in all changes up to 24.4 release. + +2014-10-15 Ivan Shmakov + + * erc-track.el (erc-modified-channels-display): Update mode line + more frequently (bug#18510). + +2014-10-10 Kelvin White + + * erc.el (erc-initialize-log-marker): Only initialize + erc-last-saved-position if not already a marker. + +2014-10-04 Stefan Monnier + + * erc.el (erc-channel-receive-names): Silence compiler warning. + (erc-format-@nick, erc-update-modes): Idem. -2014-09-24 Stefan Monnier +2014-10-03 Kelvin White + + * erc.el (erc-rename-buffers): Use defcustom instead of defvar for + buffer renaming configuration option. + +2014-10-02 Paul Eggert + + * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755). + +2014-10-02 Kelvin White + + * erc.el (erc-rename-buffer-p): When set to t buffers will be + renamed to the current irc network. + (erc-format-target-and/or-network): Use `erc-rename-buffer-p' when + renaming buffers. + + * erc-ring.el (erc-input-ring-setup): Fixes Bug #18599 + +2014-09-30 Stefan Monnier * erc-track.el (erc-modified-channels-display): Update all mode lines if needed (bug#18510). Remove call to erc-modified-channels-object diff --cc lisp/erc/erc.el index 3bb68abfc9e,3a107c69f9a..37b24eaaa60 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@@ -5361,8 -5268,9 +5361,9 @@@ This returns non-nil only if we actuall (beep)) nil) (t + (defvar str) ;; FIXME: Make it obey the "erc-" prefix convention. (let ((str input) - (erc-insert-this t)) + (erc-insert-this t)) (setq erc-send-this t) (run-hook-with-args 'erc-send-pre-hook input) (when erc-send-this